diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/h5dump/errfiles/tall-1.err | 4 | ||||
-rw-r--r-- | tools/h5dump/errfiles/tall-2A.err | 4 | ||||
-rw-r--r-- | tools/h5dump/errfiles/tall-2A0.err | 4 | ||||
-rw-r--r-- | tools/h5dump/errfiles/tall-2B.err | 4 | ||||
-rw-r--r-- | tools/h5dump/errfiles/textlink.err | 8 | ||||
-rw-r--r-- | tools/h5dump/errfiles/textlinkfar.err | 22 | ||||
-rw-r--r-- | tools/h5dump/errfiles/textlinksrc.err | 22 | ||||
-rw-r--r-- | tools/h5dump/errfiles/torderlinks1.err | 4 | ||||
-rw-r--r-- | tools/h5dump/errfiles/torderlinks2.err | 4 | ||||
-rw-r--r-- | tools/h5repack/h5repacktst.c | 4 | ||||
-rw-r--r-- | tools/misc/h5debug.c | 26 | ||||
-rw-r--r-- | tools/misc/talign.c | 3 | ||||
-rw-r--r-- | tools/perform/perf_meta.c | 2 |
13 files changed, 56 insertions, 55 deletions
diff --git a/tools/h5dump/errfiles/tall-1.err b/tools/h5dump/errfiles/tall-1.err index ba691d0..ab9dbe3 100644 --- a/tools/h5dump/errfiles/tall-1.err +++ b/tools/h5dump/errfiles/tall-1.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/tall-2A.err b/tools/h5dump/errfiles/tall-2A.err index ba691d0..ab9dbe3 100644 --- a/tools/h5dump/errfiles/tall-2A.err +++ b/tools/h5dump/errfiles/tall-2A.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/tall-2A0.err b/tools/h5dump/errfiles/tall-2A0.err index ba691d0..ab9dbe3 100644 --- a/tools/h5dump/errfiles/tall-2A0.err +++ b/tools/h5dump/errfiles/tall-2A0.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/tall-2B.err b/tools/h5dump/errfiles/tall-2B.err index ba691d0..ab9dbe3 100644 --- a/tools/h5dump/errfiles/tall-2B.err +++ b/tools/h5dump/errfiles/tall-2B.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/textlink.err b/tools/h5dump/errfiles/textlink.err index 03c0550..95556db 100644 --- a/tools/h5dump/errfiles/textlink.err +++ b/tools/h5dump/errfiles/textlink.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -25,10 +25,10 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): minor: Unable to open file HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/textlinkfar.err b/tools/h5dump/errfiles/textlinkfar.err index 969e17c..5aa7f87 100644 --- a/tools/h5dump/errfiles/textlinkfar.err +++ b/tools/h5dump/errfiles/textlinkfar.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -24,7 +24,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #008: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #009: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -67,7 +67,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #006: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #007: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -88,7 +88,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #013: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #014: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -109,7 +109,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #020: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #021: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -130,7 +130,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #027: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #028: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -164,7 +164,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #006: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #007: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -185,7 +185,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #013: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #014: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -206,7 +206,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #020: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #021: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -227,7 +227,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #027: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #028: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/textlinksrc.err b/tools/h5dump/errfiles/textlinksrc.err index 969e17c..5aa7f87 100644 --- a/tools/h5dump/errfiles/textlinksrc.err +++ b/tools/h5dump/errfiles/textlinksrc.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -24,7 +24,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #008: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #009: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -67,7 +67,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #006: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #007: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -88,7 +88,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #013: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #014: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -109,7 +109,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #020: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #021: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -130,7 +130,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #027: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #028: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -164,7 +164,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #006: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #007: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -185,7 +185,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #013: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #014: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -206,7 +206,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #020: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #021: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table @@ -227,7 +227,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): major: Symbol table minor: Can't open object #027: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #028: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/torderlinks1.err b/tools/h5dump/errfiles/torderlinks1.err index 780c7e6..e665f03 100644 --- a/tools/h5dump/errfiles/torderlinks1.err +++ b/tools/h5dump/errfiles/torderlinks1.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5dump/errfiles/torderlinks2.err b/tools/h5dump/errfiles/torderlinks2.err index 780c7e6..e665f03 100644 --- a/tools/h5dump/errfiles/torderlinks2.err +++ b/tools/h5dump/errfiles/torderlinks2.err @@ -1,9 +1,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs): #000: (file name) line (number) in H5Oopen(): unable to open object - major: Symbol table + major: Object header minor: Can't open object #001: (file name) line (number) in H5O_open_name(): object not found - major: Symbol table + major: Object header minor: Object not found #002: (file name) line (number) in H5G_loc_find(): can't find object major: Symbol table diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c index 46d895c..3959300 100644 --- a/tools/h5repack/h5repacktst.c +++ b/tools/h5repack/h5repacktst.c @@ -1547,10 +1547,8 @@ int main (void) { hid_t fapl; - /* setup */ - h5_reset(); fapl = h5_fileaccess(); - h5_cleanup(H5REPACK_FILENAMES, fapl); + h5_clean_files(H5REPACK_FILENAMES, fapl); } diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c index 3789723..480450d 100644 --- a/tools/misc/h5debug.c +++ b/tools/misc/h5debug.c @@ -23,19 +23,19 @@ * *------------------------------------------------------------------------- */ -#define H5A_PACKAGE /*suppress error about including H5Apkg */ -#define H5B2_PACKAGE /*suppress error about including H5B2pkg */ -#define H5B2_TESTING /*suppress warning about H5B2 testing funcs*/ -#define H5D_PACKAGE /*suppress error about including H5Dpkg */ -#define H5EA_PACKAGE /*suppress error about including H5EApkg */ -#define H5EA_TESTING /*suppress warning about H5EA testing funcs*/ -#define H5FA_PACKAGE /*suppress error about including H5FApkg */ -#define H5FA_TESTING /*suppress warning about H5FA testing funcs*/ -#define H5F_PACKAGE /*suppress error about including H5Fpkg */ -#define H5G_PACKAGE /*suppress error about including H5Gpkg */ -#define H5HF_PACKAGE /*suppress error about including H5HFpkg */ -#define H5O_PACKAGE /*suppress error about including H5Opkg */ -#define H5SM_PACKAGE /*suppress error about including H5SMpkg */ +#define H5A_FRIEND /*suppress error about including H5Apkg */ +#define H5B2_FRIEND /*suppress error about including H5B2pkg */ +#define H5B2_TESTING /*suppress warning about H5B2 testing funcs*/ +#define H5D_FRIEND /*suppress error about including H5Dpkg */ +#define H5EA_FRIEND /*suppress error about including H5EApkg */ +#define H5EA_TESTING /*suppress warning about H5EA testing funcs*/ +#define H5FA_FRIEND /*suppress error about including H5FApkg */ +#define H5FA_TESTING /*suppress warning about H5FA testing funcs*/ +#define H5F_FRIEND /*suppress error about including H5Fpkg */ +#define H5G_FRIEND /*suppress error about including H5Gpkg */ +#define H5HF_FRIEND /*suppress error about including H5HFpkg */ +#define H5O_FRIEND /*suppress error about including H5Opkg */ +#define H5SM_FRIEND /*suppress error about including H5SMpkg */ #include "H5private.h" /* Generic Functions */ #include "H5Apkg.h" /* Attributes */ diff --git a/tools/misc/talign.c b/tools/misc/talign.c index 2d0a9d1..1a26a28 100644 --- a/tools/misc/talign.c +++ b/tools/misc/talign.c @@ -137,6 +137,7 @@ int main(void) H5Dread(set, fix, spc, H5S_ALL, H5P_DEFAULT, data); fptr = (float *)(data + H5Tget_member_offset(fix, 1)); + H5Dclose(set); out: if(error < 0) { @@ -194,7 +195,9 @@ out: if(data) HDfree(data); H5Sclose(spc); + H5Tclose(cs6); H5Tclose(cmp); + H5Tclose(fix); H5Tclose(cmp1); H5Tclose(cmp2); H5Tclose(cmp3); diff --git a/tools/perform/perf_meta.c b/tools/perform/perf_meta.c index b52871e..2c3a19c 100644 --- a/tools/perform/perf_meta.c +++ b/tools/perform/perf_meta.c @@ -821,7 +821,7 @@ main(int argc, char **argv) if (H5Sclose(space) < 0) goto error; if (H5Sclose(small_space) < 0) goto error; - h5_cleanup(FILENAME, fapl); + h5_clean_files(FILENAME, fapl); #ifdef H5_HAVE_PARALLEL if(facc_type == FACC_MPIO) |