summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-11-15 02:55:39 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-11-15 02:55:39 (GMT)
commita1708eb023f2c8f8ac6c2c17bf1e598c8dff956e (patch)
tree34c87a3753b36c4c8d689d58bf456eaf261cd235 /tools
parentbea1e576c5ef5500678f7ce913d835341b625e8f (diff)
downloadhdf5-a1708eb023f2c8f8ac6c2c17bf1e598c8dff956e.zip
hdf5-a1708eb023f2c8f8ac6c2c17bf1e598c8dff956e.tar.gz
hdf5-a1708eb023f2c8f8ac6c2c17bf1e598c8dff956e.tar.bz2
[svn-r11712] Purpose:
New feature Description: Check in baseline for compact group revisions, which radically revises the source code for managing groups and object headers. WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! This initiates the "unstable" phase of the 1.7.x branch, leading up to the 1.8.0 release. Please test this code, but do _NOT_ keep files created with it - the format will change again before the release and you will not be able to read your old files!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! Solution: There's too many changes to really describe them all, but some of them include: - Stop abusing the H5G_entry_t structure and split it into two separate structures for non-symbol table node use within the library: H5O_loc_t for object locations in a file and H5G_name_t to store the path to an opened object. H5G_entry_t is now only used for storing symbol table entries on disk. - Retire H5G_namei() in favor of a more general mechanism for traversing group paths and issuing callbacks on objects located. This gets us out of the business of hacking H5G_namei() for new features, generally. - Revised H5O* routines to take a H5O_loc_t instead of H5G_entry_t - Lots more... Platforms tested: h5committested and maybe another dozen configurations.... :-)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/h5repack/h5repack.sh.in2
-rw-r--r--tools/lib/h5diff_util.c8
-rw-r--r--tools/misc/h5debug.c4
3 files changed, 8 insertions, 6 deletions
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index f1c9af2..645ccc2 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -59,7 +59,7 @@ TESTING() {
#
VERIFY() {
SPACES=" "
- echo "Testing h5diff output $* $SPACES" | cut -c1-70 | tr -d '\012'
+ echo "Verifying h5diff output $* $SPACES" | cut -c1-70 | tr -d '\012'
}
# Print a message that a test has been skipped (because a required filter
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 1fc710c..32b3583 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -148,8 +148,8 @@ void print_pos( int *ph,
parallel_print("[ " );
for ( i = 0; i < rank; i++)
{
- /* HDfprintf(stdout,"%Hu ", pos[i] ); */
- parallel_print("%"H5_PRINTF_LL_WIDTH"u ", pos[i]);
+/* HDfprintf(stdout,"%Hu ", pos[i] ); */
+ parallel_print("%"H5_PRINTF_LL_WIDTH"u ", (unsigned long_long)pos[i]);
}
parallel_print("]" );
}
@@ -170,7 +170,7 @@ void print_dims( int r, hsize_t *d )
int i;
parallel_print("[ " );
for ( i=0; i<r; i++ )
- parallel_print("%d ",(int)d[i] );
+ parallel_print("%"H5_PRINTF_LL_WIDTH"u ",(unsigned long_long)d[i] );
parallel_print("] " );
}
@@ -421,7 +421,7 @@ get_class(H5T_class_t tclass)
void print_found(hsize_t nfound)
{
if(g_Parallel)
- parallel_print("%"H5_PRINTF_LL_WIDTH"u differences found\n", nfound);
+ parallel_print("%"H5_PRINTF_LL_WIDTH"u differences found\n", (unsigned long_long)nfound);
else
HDfprintf(stdout,"%Hu differences found\n",nfound);
}
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 1f1423f..9eb2d49 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -39,6 +39,7 @@
#include "H5BPpkg.h" /* B+ trees */
#include "H5BTpkg.h" /* Block tracker */
#include "H5Dprivate.h"
+#include "H5Eprivate.h" /* Error handling */
#include "H5Fpkg.h"
#include "H5Gprivate.h"
#include "H5HGprivate.h"
@@ -311,7 +312,8 @@ main(int argc, char *argv[])
}
if (status < 0) {
- fprintf(stderr, "An error occurred\n");
+ fprintf(stderr, "An error occurred!\n");
+ H5Eprint(stderr);
HDexit(5);
}
H5Pclose(dxpl);