diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-03-30 19:24:08 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-03-30 19:24:08 (GMT) |
commit | 78c1574378256975b39d4b65a011307a631dc667 (patch) | |
tree | 84e0dc9edf12a69a405c0d9da02803f2cc291382 /src/H5Oefl.c | |
parent | 2d9f2282e6e639dc5a7881c5c55c3f56d43526b1 (diff) | |
download | hdf5-78c1574378256975b39d4b65a011307a631dc667.zip hdf5-78c1574378256975b39d4b65a011307a631dc667.tar.gz hdf5-78c1574378256975b39d4b65a011307a631dc667.tar.bz2 |
[svn-r333] Changes since 19980324
----------------------
./MANIFEST
./src/H5HG.c [new]
./src/H5HGprivate.h [new]
./src/H5HGpublic.h [new]
./src/Makefile.in
Added global heaps, H5HG. This compiles but is untested.
./src/H5D.c
./src/H5G.c
./src/H5Gnode.c
./src/H5Gstab.c
./src/H5HL.c [renamed from H5H.c]
./src/H5HLprivate.h [renamed from H5Hprivate.h]
./src/H5HLpublic.h [renamed from H5Hpublic.h]
./src/H5Oefl.c
./src/Makefile.in
./src/hdf5.h
./test/theap.c
Renamed local heaps from H5H to H5HL.
./src/H5AC.c
./src/H5ACprivate.h
./src/debug.c
Added debugging support for global heap collections.
./html/H5.format.html
Ripped out the old small object heap documentation and added
documentation for the new global heap.
./html/H5.api.html
./src/H5P.c
./src/H5Ppublic.h
./src/H5F.c
./src/H5Fprivate.h
./src/H5private.h
The H5Pget_version() function no longer returns a small object
heap version number. Instead, each collection of the global
heap has its own version number instead of a single number in
the file boot block.
./bin/release
Omit files marked for removal by CVS even though the removal
hasn't been committed yet.
./test/iopipe.c
Removed warnings about casting unsigned int to double on Irix64.
./MANIFEST
Removed ./test/testpar/phdf5sup.c
Diffstat (limited to 'src/H5Oefl.c')
-rw-r--r-- | src/H5Oefl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Oefl.c b/src/H5Oefl.c index e1f3247..b4bdf19 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -7,7 +7,7 @@ */ #include <H5private.h> #include <H5Eprivate.h> -#include <H5Hprivate.h> +#include <H5HLprivate.h> #include <H5MMprivate.h> #include <H5Oprivate.h> @@ -76,7 +76,7 @@ H5O_efl_decode(H5F_t *f, size_t raw_size, const uint8 *p) H5F_addr_decode(f, &p, &(mesg->heap_addr)); #ifndef NDEBUG assert (H5F_addr_defined (&(mesg->heap_addr))); - s = H5H_peek (f, &(mesg->heap_addr), 0); + s = H5HL_peek (f, &(mesg->heap_addr), 0); assert (s && !*s); #endif UINT16DECODE(p, mesg->nalloc); @@ -90,7 +90,7 @@ H5O_efl_decode(H5F_t *f, size_t raw_size, const uint8 *p) for (i=0; i<mesg->nused; i++) { /* Name */ H5F_decode_length (f, p, mesg->slot[i].name_offset); - s = H5H_peek (f, &(mesg->heap_addr), mesg->slot[i].name_offset); + s = H5HL_peek (f, &(mesg->heap_addr), mesg->slot[i].name_offset); assert (s && *s); mesg->slot[i].name = H5MM_xstrdup (s); @@ -155,9 +155,9 @@ H5O_efl_encode(H5F_t *f, size_t raw_size, uint8 *p, const void *_mesg) * If the name has not been added to the heap yet then do so now. */ if (0==mesg->slot[i].name_offset) { - offset = H5H_insert (f, &(mesg->heap_addr), - strlen (mesg->slot[i].name)+1, - mesg->slot[i].name); + offset = H5HL_insert (f, &(mesg->heap_addr), + strlen (mesg->slot[i].name)+1, + mesg->slot[i].name); if ((size_t)(-1)==offset) { HRETURN_ERROR (H5E_EFL, H5E_CANTINIT, FAIL, "unable to insert URL into name heap"); |