summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2015-11-04 17:49:19 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2015-11-04 17:49:19 (GMT)
commit11778b82333fd06e625e4c571248910d501a1fd2 (patch)
tree3ce7e216d9f56072f43ddf26a50ee9321fe907a9 /tools/lib
parent77e6ac3324feb5d196745f31df617d568b60d975 (diff)
downloadhdf5-11778b82333fd06e625e4c571248910d501a1fd2.zip
hdf5-11778b82333fd06e625e4c571248910d501a1fd2.tar.gz
hdf5-11778b82333fd06e625e4c571248910d501a1fd2.tar.bz2
[svn-r28274] Applied patch to eliminate warnings from PRINTSTREAM macros from HDF5 1.8.16.
Update supported platform and tested configuration info in RELEASE.txt. Tested with h5committest.new.
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/h5tools.h8
-rw-r--r--tools/lib/h5tools_utils.c3
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index d6c3720..5c08f33 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -37,10 +37,10 @@
#define H5TOOLS_DUMP_MAX_RANK H5S_MAX_RANK
/* Stream macros */
-#define FLUSHSTREAM(S) if(S != NULL) HDfflush(S)
-#define PRINTSTREAM(S, F, ...) if(S != NULL) HDfprintf(S, F, __VA_ARGS__)
-#define PRINTVALSTREAM(S, V) if(S != NULL) HDfprintf(S, V)
-#define PUTSTREAM(X,S) if(S != NULL) HDfputs(X, S);
+#define FLUSHSTREAM(S) {if(S != NULL) HDfflush(S);}
+#define PRINTSTREAM(S, F, ...) {if(S != NULL) HDfprintf(S, F, __VA_ARGS__);}
+#define PRINTVALSTREAM(S, V) {if(S != NULL) HDfprintf(S, V);}
+#define PUTSTREAM(X,S) {if(S != NULL) HDfputs(X, S);}
/*
* Strings for output - these were duplicated from the h5dump.h
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index fc8cf1d..572090b 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -482,10 +482,11 @@ dump_table(char* tablename, table_t *table)
unsigned u;
PRINTSTREAM(rawoutstream,"%s: # of entries = %d\n", tablename,table->nobjs);
- for (u = 0; u < table->nobjs; u++)
+ for (u = 0; u < table->nobjs; u++) {
PRINTSTREAM(rawoutstream,"%a %s %d %d\n", table->objs[u].objno,
table->objs[u].objname,
table->objs[u].displayed, table->objs[u].recorded);
+ }
}