diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-07-22 18:45:46 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-07-22 18:45:46 (GMT) |
commit | 29a029d7e7c95be8ded8fb4e0989e3711ab7e3dc (patch) | |
tree | 1ade13b398a898accefb0eee491705edff974503 /src/H5TB.c | |
parent | c638ee56596bc8ff4908d3fb73a6911ad6181d01 (diff) | |
download | hdf5-29a029d7e7c95be8ded8fb4e0989e3711ab7e3dc.zip hdf5-29a029d7e7c95be8ded8fb4e0989e3711ab7e3dc.tar.gz hdf5-29a029d7e7c95be8ded8fb4e0989e3711ab7e3dc.tar.bz2 |
[svn-r529] Changes since 19980722
----------------------
./src/H5.c
Handle hid_t of type H5_TEMPBUF, arguments usually called tbuf_id.
Added array tracing where the array rank is stored in a simple
data space. Just use the name of the data space argument when
declaring the array argument:
herr_t
H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
const hssize_t start[/*space_id*/],
const hsize_t _stride[/*space_id*/],
const hsize_t count[/*space_id*/],
const hsize_t _block[/*space_id*/])
and when the program runs you'll see array values printed:
H5Sselect_hyperslab(space=218103813, op=H5S_SELECT_SET,
start=0xbfffef4c {0}, _stride=NULL,
count=0xbfffef44 {64},
_block=NULL) = SUCCEED;
Added more symbolic data types to the tracing output.
./src/H5A.c
./src/H5Apublic.h
./src/H5D.c
./src/H5Dpublic.h
./src/H5F.c
./src/H5Fpublic.h
./src/H5G.c
./src/H5Gpublic.h
./src/H5P.c
./src/H5Ppublic.h
./src/H5S.c
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Spoint.c
./src/H5Spublic.h
./src/H5Sselect.c
./src/H5Ssimp.c
./src/H5TB.c
./src/H5V.c
Changed some API argument names to be more consistent with
other API functions and to produce better tracing output.
Reformatted some long lines. Indented printf statements.
./tools/h5ls.c
Fixed warnings about unsigned vs. signed comparisons.
Diffstat (limited to 'src/H5TB.c')
-rw-r--r-- | src/H5TB.c | 41 |
1 files changed, 24 insertions, 17 deletions
@@ -282,8 +282,8 @@ done: PURPOSE Get the pointer to a temp. buffer memory USAGE - void *H5TBbuf_ptr(tbid) - hid_t tbid; IN: Temp. buffer ID + void *H5TBbuf_ptr(tbuf_id) + hid_t tbuf_id; IN: Temp. buffer ID RETURNS Non-NULL pointer to buffer memory on success, NULL on failure DESCRIPTION @@ -294,15 +294,15 @@ done: REVISION LOG --------------------------------------------------------------------------*/ void * -H5TBbuf_ptr(hid_t tbid) +H5TBbuf_ptr(hid_t tbuf_id) { void *ret_value = NULL; H5TB_t *tbuf; /* Pointer to temporary buffer */ FUNC_ENTER (H5TBbuf_ptr, NULL); - if (H5_TEMPBUF != H5I_group(tbid) || - NULL == (tbuf = H5I_object(tbid))) { + if (H5_TEMPBUF != H5I_group(tbuf_id) || + NULL == (tbuf = H5I_object(tbuf_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a temp. buffer"); } @@ -335,7 +335,7 @@ done: REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5TBresize_ptr (hid_t tbid, hsize_t size) +H5TBresize_ptr (hid_t tbuf_id, hsize_t size) { herr_t ret_value = FAIL; H5TB_t *tbuf, /* Pointer to temporary buffer */ @@ -343,10 +343,10 @@ H5TBresize_ptr (hid_t tbid, hsize_t size) void * old_ptr; /* Pointer to the previous buffer */ FUNC_ENTER (H5TBresize_ptr, FAIL); - H5TRACE2("e","ih",tbid,size); + H5TRACE2("e","ih",tbuf_id,size); - if (H5_TEMPBUF != H5I_group(tbid) || - NULL == (tbuf = H5I_object(tbid))) { + if (H5_TEMPBUF != H5I_group(tbuf_id) || + NULL == (tbuf = H5I_object(tbuf_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a temp. buffer"); } @@ -387,7 +387,11 @@ H5TBresize_ptr (hid_t tbid, hsize_t size) } /* end while */ /* Insert into correct position in list */ - if(curr!=NULL) { /* can't be adding to the beginning of list, so this is in the middle somewhere */ + if(curr!=NULL) { + /* + * Can't be adding to the beginning of list, so this is in the + * middle somewhere. + */ curr->prev->next=tbuf; tbuf->prev=curr->prev; curr->prev=tbuf; @@ -434,7 +438,10 @@ H5TBgarbage_coll (void) FUNC_ENTER (H5TBgarbage_coll, FAIL); H5TRACE0("e",""); - /* Step through the list, remove each unused node, repair the list and free the node */ + /* + * Step through the list, remove each unused node, repair the list and + * free the node. + */ curr=H5TB_list_head; while(curr!=NULL) { next=curr->next; @@ -475,8 +482,8 @@ done: PURPOSE Release a temp. buffer back to the list of unused ones. USAGE - herr_t H5TBrelease_buf(tbid) - hid_t tbid; IN: Temp. buffer ID to release + herr_t H5TBrelease_buf(tbuf_id) + hid_t tbuf_id; IN: Temp. buffer ID to release RETURNS non-negative on success, negative on failure DESCRIPTION @@ -487,16 +494,16 @@ done: REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5TBrelease_buf (hid_t tbid) +H5TBrelease_buf (hid_t tbuf_id) { herr_t ret_value = FAIL; H5TB_t *tbuf; /* Pointer to temporary buffer */ FUNC_ENTER (H5TBresize_ptr, FAIL); - H5TRACE1("e","i",tbid); + H5TRACE1("e","i",tbuf_id); - if (H5_TEMPBUF != H5I_group(tbid) || - NULL == (tbuf = H5I_object(tbid))) { + if (H5_TEMPBUF != H5I_group(tbuf_id) || + NULL == (tbuf = H5I_object(tbuf_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a temp. buffer"); } |