summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2013-08-19 22:13:15 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2013-08-19 22:13:15 (GMT)
commit482a9c28e71b0c1b3767bcf30be3c534bbc65ed9 (patch)
tree79a9cae55a104fadf1cc5ca8d11afc493c856690 /tools/lib
parentc502d81a8c87dd2bce47a5476e3331b04fc69322 (diff)
downloadhdf5-482a9c28e71b0c1b3767bcf30be3c534bbc65ed9.zip
hdf5-482a9c28e71b0c1b3767bcf30be3c534bbc65ed9.tar.gz
hdf5-482a9c28e71b0c1b3767bcf30be3c534bbc65ed9.tar.bz2
[svn-r24030] Description:
Clean up more compiler warnings. Tested on: Mac OSX/64 10.8.4 (amazon) w/gcc, C++ & FORTRAN (too minor to require h5committest)
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/h5tools_dump.c2
-rw-r--r--tools/lib/h5tools_dump.h2
-rw-r--r--tools/lib/h5trav.c48
3 files changed, 28 insertions, 24 deletions
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index cde249c..75d3c67 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -3497,7 +3497,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
*/
void
h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
- h5tools_context_t *ctx, hid_t oid, const char *attr_name, hid_t attr_id,
+ h5tools_context_t *ctx, const char *attr_name, hid_t attr_id,
int display_index, int display_char)
{
h5tools_str_t buffer; /* string into which to render */
diff --git a/tools/lib/h5tools_dump.h b/tools/lib/h5tools_dump.h
index 86f9f99..061a3db 100644
--- a/tools/lib/h5tools_dump.h
+++ b/tools/lib/h5tools_dump.h
@@ -52,7 +52,7 @@ H5TOOLS_DLL void h5tools_dump_datatype(FILE *stream, const h5tool_format_t *i
H5TOOLS_DLL void h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info,
h5tools_context_t *ctx/*in,out*/, hid_t space);
H5TOOLS_DLL void h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
- h5tools_context_t *ctx/*in,out*/, hid_t oid, const char *attr_name,
+ h5tools_context_t *ctx/*in,out*/, const char *attr_name,
hid_t attr_id, int display_index, int display_char);
H5TOOLS_DLL void h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
h5tools_context_t *ctx/*in,out*/, hid_t oid);
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 8455360..58d7959 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -724,22 +724,22 @@ trav_table_add(trav_table_t *table,
const char *path,
const H5O_info_t *oinfo)
{
- size_t new;
+ size_t new_obj;
if(table->nobjs == table->size) {
table->size = MAX(1, table->size * 2);
table->objs = (trav_obj_t*)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
} /* end if */
- new = table->nobjs++;
- table->objs[new].objno = oinfo ? oinfo->addr : HADDR_UNDEF;
- table->objs[new].flags[0] = table->objs[new].flags[1] = 0;
- table->objs[new].is_same_trgobj = 0;
- table->objs[new].name = (char *)HDstrdup(path);
- table->objs[new].type = oinfo ? (h5trav_type_t)oinfo->type : H5TRAV_TYPE_LINK;
- table->objs[new].nlinks = 0;
- table->objs[new].sizelinks = 0;
- table->objs[new].links = NULL;
+ new_obj = table->nobjs++;
+ table->objs[new_obj].objno = oinfo ? oinfo->addr : HADDR_UNDEF;
+ table->objs[new_obj].flags[0] = table->objs[new_obj].flags[1] = 0;
+ table->objs[new_obj].is_same_trgobj = 0;
+ table->objs[new_obj].name = (char *)HDstrdup(path);
+ table->objs[new_obj].type = oinfo ? (h5trav_type_t)oinfo->type : H5TRAV_TYPE_LINK;
+ table->objs[new_obj].nlinks = 0;
+ table->objs[new_obj].sizelinks = 0;
+ table->objs[new_obj].links = NULL;
}
/*-------------------------------------------------------------------------
@@ -807,23 +807,23 @@ void trav_table_addflags(unsigned *flags,
h5trav_type_t type,
trav_table_t *table)
{
- unsigned int new;
+ unsigned int new_obj;
if(table->nobjs == table->size) {
table->size = MAX(1, table->size * 2);
table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
} /* end if */
- new = table->nobjs++;
- table->objs[new].objno = 0;
- table->objs[new].flags[0] = flags[0];
- table->objs[new].flags[1] = flags[1];
- table->objs[new].is_same_trgobj = 0;
- table->objs[new].name = (char *)HDstrdup(name);
- table->objs[new].type = type;
- table->objs[new].nlinks = 0;
- table->objs[new].sizelinks = 0;
- table->objs[new].links = NULL;
+ new_obj = table->nobjs++;
+ table->objs[new_obj].objno = 0;
+ table->objs[new_obj].flags[0] = flags[0];
+ table->objs[new_obj].flags[1] = flags[1];
+ table->objs[new_obj].is_same_trgobj = 0;
+ table->objs[new_obj].name = (char *)HDstrdup(name);
+ table->objs[new_obj].type = type;
+ table->objs[new_obj].nlinks = 0;
+ table->objs[new_obj].sizelinks = 0;
+ table->objs[new_obj].links = NULL;
}
@@ -890,7 +890,11 @@ void trav_table_free( trav_table_t *table )
}
static herr_t
-trav_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *op_data)
+trav_attr(hid_t
+#ifndef H5TRAV_PRINT_SPACE
+UNUSED
+#endif /* H5TRAV_PRINT_SPACE */
+obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *op_data)
{
char *buf;