From 0919299628582670f9144167f3c7da6096fb58f1 Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Wed, 4 Apr 2007 14:16:18 -0500 Subject: [svn-r13587] more code cleaning tested linux --- tools/h5repack/h5repack.c | 4 +--- tools/h5repack/h5repack.h | 4 ++++ tools/h5repack/h5repack_copy.c | 3 +-- tools/h5repack/h5repack_filters.c | 4 +--- tools/h5repack/h5repack_list.c | 3 +-- tools/h5repack/h5repack_opttable.c | 3 +-- tools/h5repack/h5repack_parse.c | 3 +-- tools/h5repack/h5repack_refs.c | 3 +-- tools/h5repack/h5repack_verify.c | 4 +--- tools/h5repack/h5repacktst.c | 5 +---- tools/h5repack/testh5repack_detect_szip.c | 4 +--- 11 files changed, 14 insertions(+), 26 deletions(-) diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c index 5295970..9e7da9e 100644 --- a/tools/h5repack/h5repack.c +++ b/tools/h5repack/h5repack.c @@ -15,12 +15,10 @@ #include #include -#include "hdf5.h" -#include "h5trav.h" +#include "h5repack.h" #include "h5diff.h" #include "h5tools.h" #include "h5tools_utils.h" -#include "h5repack.h" extern char *progname; diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h index 4b2124b..c3772cf 100644 --- a/tools/h5repack/h5repack.h +++ b/tools/h5repack/h5repack.h @@ -17,6 +17,10 @@ #ifndef H5REPACK_H__ #define H5REPACK_H__ +#include "hdf5.h" +#include "h5trav.h" + + #define H5FOPENERROR "unable to open file" diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 3b9fa41..3e9d2b6 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -16,11 +16,10 @@ #include #include #include +#include "h5repack.h" #include "H5private.h" #include "h5tools.h" #include "h5tools_utils.h" -#include "h5trav.h" -#include "h5repack.h" extern char *progname; diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c index 4cdc772..e102cf6 100644 --- a/tools/h5repack/h5repack_filters.c +++ b/tools/h5repack/h5repack_filters.c @@ -13,10 +13,8 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "hdf5.h" -#include "h5test.h" -#include "h5trav.h" #include "h5repack.h" +#include "h5test.h" /*------------------------------------------------------------------------- diff --git a/tools/h5repack/h5repack_list.c b/tools/h5repack/h5repack_list.c index 0d26dd3..c391272 100644 --- a/tools/h5repack/h5repack_list.c +++ b/tools/h5repack/h5repack_list.c @@ -16,11 +16,10 @@ #include #include #include +#include "h5repack.h" #include "H5private.h" #include "h5tools.h" #include "h5tools_utils.h" -#include "h5trav.h" -#include "h5repack.h" extern char *progname; diff --git a/tools/h5repack/h5repack_opttable.c b/tools/h5repack/h5repack_opttable.c index e36645d..62c8370 100644 --- a/tools/h5repack/h5repack_opttable.c +++ b/tools/h5repack/h5repack_opttable.c @@ -15,9 +15,8 @@ #include #include -#include "h5tools_utils.h" -#include "h5trav.h" #include "h5repack.h" +#include "h5tools_utils.h" extern char *progname; diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c index 3effffd..a067011 100644 --- a/tools/h5repack/h5repack_parse.c +++ b/tools/h5repack/h5repack_parse.c @@ -17,9 +17,8 @@ #include #include #include -#include "h5tools_utils.h" -#include "h5trav.h" #include "h5repack.h" +#include "h5tools_utils.h" extern char *progname; diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c index fbc914c..d94c250 100644 --- a/tools/h5repack/h5repack_refs.c +++ b/tools/h5repack/h5repack_refs.c @@ -17,10 +17,9 @@ #include #include #include +#include "h5repack.h" #include "H5private.h" #include "h5tools.h" -#include "h5trav.h" -#include "h5repack.h" /*------------------------------------------------------------------------- * local functions diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c index 3ede186..bb910f6 100644 --- a/tools/h5repack/h5repack_verify.c +++ b/tools/h5repack/h5repack_verify.c @@ -13,12 +13,10 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "hdf5.h" +#include "h5repack.h" #include "h5test.h" #include "h5tools.h" #include "h5tools_utils.h" -#include "h5trav.h" -#include "h5repack.h" extern char *progname; diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c index ed55b60..33d4692 100644 --- a/tools/h5repack/h5repacktst.c +++ b/tools/h5repack/h5repacktst.c @@ -13,12 +13,9 @@ * access to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#include "hdf5.h" +#include "h5repack.h" #include "h5test.h" #include "h5tools.h" -#include "h5trav.h" -#include "h5repack.h" #include "h5diff.h" #define GOERROR {H5_FAILED(); goto error;} diff --git a/tools/h5repack/testh5repack_detect_szip.c b/tools/h5repack/testh5repack_detect_szip.c index cb7eae3..778d574 100644 --- a/tools/h5repack/testh5repack_detect_szip.c +++ b/tools/h5repack/testh5repack_detect_szip.c @@ -14,10 +14,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include -#include "hdf5.h" -#include "h5test.h" -#include "h5trav.h" #include "h5repack.h" +#include "h5test.h" /*------------------------------------------------------------------------- -- cgit v0.12