mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r12003] Purpose:

Browse Source 
Code cleanup

Description:
    Fix some warnings & formatting issues

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Linux 2.4
This commit is contained in:
Quincey Koziol 2006-03-04 17:38:37 -05:00
parent e88e34e5d8
commit 0e708b387c
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/H5B2dbg.c
View File

@ -98,6 +98,7 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
HDassert(stream); HDassert(stream);
HDassert(indent >= 0); HDassert(indent >= 0);
HDassert(fwidth >= 0); HDassert(fwidth >= 0);
HDassert(type);
/* /*
* Load the B-tree header. * Load the B-tree header.
@ -202,30 +203,33 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
/* /*
* Check arguments. * Check arguments.
*/ */
assert(f); HDassert(f);
assert(H5F_addr_defined(addr)); HDassert(H5F_addr_defined(addr));
assert(stream); HDassert(stream);
assert(indent >= 0); HDassert(indent >= 0);
assert(fwidth >= 0); HDassert(fwidth >= 0);
HDassert(type);
HDassert(H5F_addr_defined(hdr_addr));
HDassert(nrec > 0);
/* /*
* Load the B-tree header. * Load the B-tree header.
*/ */
if (NULL == (bt2 = H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, type, NULL, H5AC_READ))) if(NULL == (bt2 = H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, type, NULL, H5AC_READ)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header") HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
/* Get the pointer to the shared B-tree info */ /* Get the pointer to the shared B-tree info */
shared=H5RC_GET_OBJ(bt2->shared); shared = H5RC_GET_OBJ(bt2->shared);
assert(shared); HDassert(shared);
/* /*
* Load the B-tree internal node * Load the B-tree internal node
*/ */
if (NULL == (internal = H5AC_protect(f, dxpl_id, H5AC_BT2_INT, addr, &nrec, bt2->shared, H5AC_READ))) if(NULL == (internal = H5AC_protect(f, dxpl_id, H5AC_BT2_INT, addr, &nrec, bt2->shared, H5AC_READ)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node") HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
/* Release the B-tree header */ /* Release the B-tree header */
if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, bt2, H5AC__NO_FLAGS_SET) < 0) if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, bt2, H5AC__NO_FLAGS_SET) < 0)
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header") HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
bt2 = NULL; bt2 = NULL;
@ -253,9 +257,9 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
internal->nrec); internal->nrec);
/* Print all node pointers and records */ /* Print all node pointers and records */
for(u=0; u<internal->nrec; u++) { for(u = 0; u < internal->nrec; u++) {
/* Print node pointer */ /* Print node pointer */
sprintf(temp_str,"Node pointer #%u: (all/node/addr)",u); sprintf(temp_str, "Node pointer #%u: (all/node/addr)", u);
HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3), HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3),
temp_str, temp_str,
internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].all_nrec,
@ -263,16 +267,16 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
internal->node_ptrs[u].addr); internal->node_ptrs[u].addr);
/* Print record */ /* Print record */
sprintf(temp_str,"Record #%u:",u); sprintf(temp_str, "Record #%u:", u);
HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
temp_str); temp_str);
assert(H5B2_INT_NREC(internal,shared,u)); HDassert(H5B2_INT_NREC(internal, shared, u));
(void)(type->debug)(stream, f, dxpl_id, indent+6, MAX (0, fwidth-6), (void)(type->debug)(stream, f, dxpl_id, indent + 6, MAX (0, fwidth-6),
H5B2_INT_NREC(internal,shared,u), NULL); H5B2_INT_NREC(internal,shared,u), NULL);
} /* end for */ } /* end for */
/* Print final node pointer */ /* Print final node pointer */
sprintf(temp_str,"Node pointer #%u: (all/node/addr)",u); sprintf(temp_str, "Node pointer #%u: (all/node/addr)", u);
HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3), HDfprintf(stream, "%*s%-*s (%Hu/%u/%a)\n", indent + 3, "", MAX(0, fwidth - 3),
temp_str, temp_str,
internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].all_nrec,
@ -280,7 +284,7 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
internal->node_ptrs[u].addr); internal->node_ptrs[u].addr);
done: done:
if (internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, addr, internal, H5AC__NO_FLAGS_SET) < 0) if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, addr, internal, H5AC__NO_FLAGS_SET) < 0)
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree internal node") HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree internal node")
FUNC_LEAVE_NOAPI(ret_value) FUNC_LEAVE_NOAPI(ret_value)
@ -316,30 +320,33 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
/* /*
* Check arguments. * Check arguments.
*/ */
assert(f); HDassert(f);
assert(H5F_addr_defined(addr)); HDassert(H5F_addr_defined(addr));
assert(stream); HDassert(stream);
assert(indent >= 0); HDassert(indent >= 0);
assert(fwidth >= 0); HDassert(fwidth >= 0);
HDassert(type);
HDassert(H5F_addr_defined(hdr_addr));
HDassert(nrec > 0);
/* /*
* Load the B-tree header. * Load the B-tree header.
*/ */
if (NULL == (bt2 = H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, type, NULL, H5AC_READ))) if(NULL == (bt2 = H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, type, NULL, H5AC_READ)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header") HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
/* Get the pointer to the shared B-tree info */ /* Get the pointer to the shared B-tree info */
shared=H5RC_GET_OBJ(bt2->shared); shared = H5RC_GET_OBJ(bt2->shared);
assert(shared); HDassert(shared);
/* /*
* Load the B-tree leaf node * Load the B-tree leaf node
*/ */
if (NULL == (leaf = H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, addr, &nrec, bt2->shared, H5AC_READ))) if(NULL == (leaf = H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, addr, &nrec, bt2->shared, H5AC_READ)))
HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree leaf node") HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree leaf node")
/* Release the B-tree header */ /* Release the B-tree header */
if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, bt2, H5AC__NO_FLAGS_SET) < 0) if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, bt2, H5AC__NO_FLAGS_SET) < 0)
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header") HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
bt2 = NULL; bt2 = NULL;
@ -367,18 +374,18 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
leaf->nrec); leaf->nrec);
/* Print all node pointers and records */ /* Print all node pointers and records */
for(u=0; u<leaf->nrec; u++) { for(u = 0; u < leaf->nrec; u++) {
/* Print record */ /* Print record */
sprintf(temp_str,"Record #%u:",u); sprintf(temp_str, "Record #%u:", u);
HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
temp_str); temp_str);
assert(H5B2_LEAF_NREC(leaf,shared,u)); HDassert(H5B2_LEAF_NREC(leaf, shared, u));
(void)(type->debug)(stream, f, dxpl_id, indent+6, MAX (0, fwidth-6), (void)(type->debug)(stream, f, dxpl_id, indent+6, MAX (0, fwidth-6),
H5B2_LEAF_NREC(leaf,shared,u), NULL); H5B2_LEAF_NREC(leaf,shared,u), NULL);
} /* end for */ } /* end for */
done: done:
if (leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, addr, leaf, H5AC__NO_FLAGS_SET) < 0) if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, addr, leaf, H5AC__NO_FLAGS_SET) < 0)
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree leaf node") HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree leaf node")
FUNC_LEAVE_NOAPI(ret_value) FUNC_LEAVE_NOAPI(ret_value)

2
src/H5RS.c
View File

@ -62,7 +62,7 @@ H5RS_xstrdup(const char *s)
{ {
char *ret_value; /* Return value */ char *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5RS_xstrdup) FUNC_ENTER_NOAPI_NOINIT(H5RS_xstrdup)
if(s) { if(s) {
ret_value = (char *)H5FL_BLK_MALLOC(str_buf, HDstrlen(s) + 1); ret_value = (char *)H5FL_BLK_MALLOC(str_buf, HDstrlen(s) + 1);