diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2016-05-30 07:03:37 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-05-30 07:03:37 (GMT) |
commit | cc95ed32fd506e06093b70ff8db47f21309d693c (patch) | |
tree | 7ad64419dfeea7380156b53cabecdc052f7ea92e /src/H5ST.c | |
parent | 8e5447a185442fa9a5e977fc5be5c95e0b1866db (diff) | |
download | hdf5-cc95ed32fd506e06093b70ff8db47f21309d693c.zip hdf5-cc95ed32fd506e06093b70ff8db47f21309d693c.tar.gz hdf5-cc95ed32fd506e06093b70ff8db47f21309d693c.tar.bz2 |
[svn-r29978] Description:
Bring r29914 from revise_chunks branch to trunk:
Banished -Wformat= warnings from the library, tools, and tests.
Tested on:
MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5ST.c')
-rw-r--r-- | src/H5ST.c | 34 |
1 files changed, 19 insertions, 15 deletions
@@ -23,6 +23,10 @@ Bentley and Robert Sedgewick in the April, 1998, Dr. Dobb's Journal. #include "H5FLprivate.h" /* Free lists */ #include "H5STprivate.h" /* Ternary search trees */ +#ifdef H5ST_DEBUG +static herr_t H5ST__dump_internal(H5ST_ptr_t p); +#endif /* H5ST_DEBUG */ + /* Declare a free list to manage the H5ST_node_t struct */ H5FL_DEFINE_STATIC(H5ST_node_t); @@ -719,7 +723,7 @@ done: /*-------------------------------------------------------------------------- NAME - H5ST_dump_internal + H5ST__dump_internal PURPOSE Dump all the nodes of a TST USAGE @@ -735,30 +739,30 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -herr_t -H5ST_dump_internal(H5ST_ptr_t p) +static herr_t +H5ST__dump_internal(H5ST_ptr_t p) { - FUNC_ENTER_NOAPI_NOINIT_NOERR + FUNC_ENTER_STATIC_NOERR if(p) { - printf("p=%p\n", p); - printf("\tp->up=%p\n", p->up); - printf("\tp->parent=%p\n", p->parent); - printf("\tp->lokid=%p\n", p->lokid); - printf("\tp->hikid=%p\n", p->hikid); - printf("\tp->eqkid=%p\n", p->eqkid); + printf("p=%p\n", (void *)p); + printf("\tp->up=%p\n", (void *)p->up); + printf("\tp->parent=%p\n", (void *)p->parent); + printf("\tp->lokid=%p\n", (void *)p->lokid); + printf("\tp->hikid=%p\n", (void *)p->hikid); + printf("\tp->eqkid=%p\n", (void *)p->eqkid); printf("\tp->splitchar=%c\n", p->splitchar); - H5ST_dump_internal(p->lokid); + H5ST__dump_internal(p->lokid); if(p->splitchar) - H5ST_dump_internal(p->eqkid); + H5ST__dump_internal(p->eqkid); else printf("%s\n", (char *)p->eqkid); - H5ST_dump_internal(p->hikid); + H5ST__dump_internal(p->hikid); } /* end if */ FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5ST_dump_internal() */ +} /* end H5ST__dump_internal() */ /*-------------------------------------------------------------------------- @@ -785,7 +789,7 @@ H5ST_dump(H5ST_tree_t *tree) FUNC_ENTER_NOAPI_NOINIT_NOERR /* Dump the tree */ - H5ST_dump_internal(tree->root); + H5ST__dump_internal(tree->root); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5ST_dump() */ |