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/H5Gnode.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/H5Gnode.c')
-rw-r--r-- | src/H5Gnode.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 79b016a..e447742 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -25,7 +25,7 @@ #include <H5Bprivate.h> /*B-link trees */ #include <H5Eprivate.h> /*error handling */ #include <H5Gpkg.h> /*me */ -#include <H5Hprivate.h> /*heap */ +#include <H5HLprivate.h> /*heap */ #include <H5MFprivate.h> /*file memory management */ #include <H5MMprivate.h> /*core memory management */ #include <H5Oprivate.h> /*header messages */ @@ -486,11 +486,11 @@ H5G_node_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) assert(lt_key); assert(rt_key); - if (NULL == (s1 = H5H_peek(f, &(udata->heap_addr), lt_key->offset))) { + if (NULL == (s1 = H5HL_peek(f, &(udata->heap_addr), lt_key->offset))) { HRETURN_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol name"); } - if (NULL == (s2 = H5H_peek(f, &(udata->heap_addr), rt_key->offset))) { + if (NULL == (s2 = H5HL_peek(f, &(udata->heap_addr), rt_key->offset))) { HRETURN_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol name"); } @@ -538,7 +538,7 @@ H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) FUNC_ENTER(H5G_node_cmp3, FAIL); /* left side */ - if (NULL == (s = H5H_peek(f, &(udata->heap_addr), lt_key->offset))) { + if (NULL == (s = H5HL_peek(f, &(udata->heap_addr), lt_key->offset))) { HRETURN_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol name"); } @@ -546,7 +546,7 @@ H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) HRETURN(-1); /* right side */ - if (NULL == (s = H5H_peek(f, &(udata->heap_addr), rt_key->offset))) { + if (NULL == (s = H5HL_peek(f, &(udata->heap_addr), rt_key->offset))) { HRETURN_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol name"); } @@ -618,7 +618,7 @@ H5G_node_found(H5F_t *f, const haddr_t *addr, const void *_lt_key, rt = sn->nsyms; while (lt < rt && cmp) { idx = (lt + rt) / 2; - if (NULL == (s = H5H_peek(f, &(bt_udata->heap_addr), + if (NULL == (s = H5HL_peek(f, &(bt_udata->heap_addr), sn->entry[idx].name_off))) { HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol name"); @@ -739,7 +739,7 @@ H5G_node_insert(H5F_t *f, const haddr_t *addr, rt = sn->nsyms; while (lt < rt) { idx = (lt + rt) / 2; - if (NULL == (s = H5H_peek(f, &(bt_udata->heap_addr), + if (NULL == (s = H5HL_peek(f, &(bt_udata->heap_addr), sn->entry[idx].name_off))) { HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5B_INS_ERROR, "unable to read symbol name"); @@ -760,7 +760,7 @@ H5G_node_insert(H5F_t *f, const haddr_t *addr, /* * Add the new name to the heap. */ - offset = H5H_insert(f, &(bt_udata->heap_addr), HDstrlen(bt_udata->name)+1, + offset = H5HL_insert(f, &(bt_udata->heap_addr), HDstrlen(bt_udata->name)+1, bt_udata->name); bt_udata->ent.name_off = offset; if (0==offset || (size_t)(-1)==offset) { @@ -898,7 +898,7 @@ H5G_node_iterate (H5F_t *f, const haddr_t *addr, void *_udata) if (bt_udata->skip>0) { --bt_udata->skip; } else { - name = H5H_peek (f, &(bt_udata->group->ent.cache.stab.heap_addr), + name = H5HL_peek (f, &(bt_udata->group->ent.cache.stab.heap_addr), name_off[i]); assert (name); n = strlen (name); @@ -983,7 +983,7 @@ H5G_node_debug(H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, for (i = 0; i < sn->nsyms; i++) { fprintf(stream, "%*sSymbol %d:\n", indent - 3, "", i); if (H5F_addr_defined(heap) && - (s = H5H_peek(f, heap, sn->entry[i].name_off))) { + (s = H5HL_peek(f, heap, sn->entry[i].name_off))) { fprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth, "Name:", s); |