summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2011-01-26 21:54:49 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2011-01-26 21:54:49 (GMT)
commit83292cf765186eeb7e377676a66c42e36d9f1edf (patch)
tree640f514640356862bf6eafef07277eadaa3e694c
parent9379ce4c492c539cc1136b5e7dda436a2c0e7db0 (diff)
downloadhdf5-83292cf765186eeb7e377676a66c42e36d9f1edf.zip
hdf5-83292cf765186eeb7e377676a66c42e36d9f1edf.tar.gz
hdf5-83292cf765186eeb7e377676a66c42e36d9f1edf.tar.bz2
[svn-r20007] Purpose:
Clean up tool code. Remove "h5test.h" from tool code. Currently only in h5repack. Tested: jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), linew (solaris-BE), tejeda (mac32-LE)
-rw-r--r--tools/h5repack/h5repack.h1
-rw-r--r--tools/h5repack/h5repack_filters.c9
-rw-r--r--tools/h5repack/h5repack_verify.c6
3 files changed, 14 insertions, 2 deletions
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index f7445ac..163b277 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -17,6 +17,7 @@
#ifndef H5REPACK_H__
#define H5REPACK_H__
+#include <assert.h>
#include "hdf5.h"
#include "h5trav.h"
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 8075a77..c7d8b1e 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -14,9 +14,16 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "h5repack.h"
-#include "h5test.h"
#include "h5tools.h"
+/* number of members in an array */
+#ifndef NELMTS
+# define NELMTS(X) (sizeof(X)/sizeof(X[0]))
+#endif
+
+/* minimum of two values */
+#undef MIN
+#define MIN(a,b) (((a)<(b)) ? (a) : (b))
/*-------------------------------------------------------------------------
* Function: aux_find_obj
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index d83f23b..2aabd46 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -14,9 +14,13 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "h5repack.h"
-#include "h5test.h"
#include "h5tools_utils.h"
+/* number of members in an array */
+#ifndef NELMTS
+# define NELMTS(X) (sizeof(X)/sizeof(X[0]))
+#endif
+
static int verify_layout(hid_t pid, pack_info_t *obj);
static int verify_filters(hid_t pid, hid_t tid, int nfilters, filter_info_t *filter);