diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-28 11:42:41 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-28 11:42:41 (GMT) |
commit | f563c2b926445f7a975553bc7742a38f42d3b6f4 (patch) | |
tree | fd21684ce4e86bd32d945ba1bd3d8065dbcf194f /tools/test | |
parent | fe4b1c572841fff38a6b9422ea63d345ccfa96bf (diff) | |
download | hdf5-f563c2b926445f7a975553bc7742a38f42d3b6f4.zip hdf5-f563c2b926445f7a975553bc7742a38f42d3b6f4.tar.gz hdf5-f563c2b926445f7a975553bc7742a38f42d3b6f4.tar.bz2 |
Sync tools with develop (#3301)
Diffstat (limited to 'tools/test')
29 files changed, 198 insertions, 153 deletions
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c index 0661b5a..37c2cc3 100644 --- a/tools/test/h5diff/h5diffgentest.c +++ b/tools/test/h5diff/h5diffgentest.c @@ -538,7 +538,7 @@ error: H5Sclose(space); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_onion_1d_dset */ @@ -972,7 +972,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* test_onion_dset_extension */ @@ -5656,7 +5656,7 @@ error: H5Tclose(tid1); H5Tclose(tid2); } - H5E_END_TRY; + H5E_END_TRY } static hid_t @@ -8649,7 +8649,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -8703,7 +8703,7 @@ error: H5Fclose(fid1); H5Fclose(fid2); } - H5E_END_TRY; + H5E_END_TRY } /*------------------------------------------------------------------------- @@ -8787,7 +8787,7 @@ error: H5Dclose(did); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* end write_dset() */ diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt index fe3474c..dbd5418 100644 --- a/tools/test/h5diff/testfiles/h5diff_10.txt +++ b/tools/test/h5diff/testfiles/h5diff_10.txt @@ -37,6 +37,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt index eaf9c15..46a1c45 100644 --- a/tools/test/h5diff/testfiles/h5diff_600.txt +++ b/tools/test/h5diff/testfiles/h5diff_600.txt @@ -37,6 +37,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt index aa0697a..e930dbe 100644 --- a/tools/test/h5diff/testfiles/h5diff_603.txt +++ b/tools/test/h5diff/testfiles/h5diff_603.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt index 87d6b01..02b80eb 100644 --- a/tools/test/h5diff/testfiles/h5diff_606.txt +++ b/tools/test/h5diff/testfiles/h5diff_606.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt index a44d94a..4cccece 100644 --- a/tools/test/h5diff/testfiles/h5diff_612.txt +++ b/tools/test/h5diff/testfiles/h5diff_612.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt index 5dc9cd3..3641164 100644 --- a/tools/test/h5diff/testfiles/h5diff_615.txt +++ b/tools/test/h5diff/testfiles/h5diff_615.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt index d7998b5..05b952c 100644 --- a/tools/test/h5diff/testfiles/h5diff_621.txt +++ b/tools/test/h5diff/testfiles/h5diff_621.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt index badfddd..4d3e945 100644 --- a/tools/test/h5diff/testfiles/h5diff_622.txt +++ b/tools/test/h5diff/testfiles/h5diff_622.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt index 6ddd3da..fd992ef 100644 --- a/tools/test/h5diff/testfiles/h5diff_623.txt +++ b/tools/test/h5diff/testfiles/h5diff_623.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt index 083632a..cc9578f 100644 --- a/tools/test/h5diff/testfiles/h5diff_624.txt +++ b/tools/test/h5diff/testfiles/h5diff_624.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c index 52e2d3f..aad1b8d 100644 --- a/tools/test/h5dump/h5dumpgentest.c +++ b/tools/test/h5dump/h5dumpgentest.c @@ -2675,7 +2675,7 @@ error: H5Sclose(space); H5Dclose(dset); } - H5E_END_TRY; + H5E_END_TRY } static void @@ -5374,7 +5374,7 @@ out: { H5Dclose(dsid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -6545,7 +6545,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY } /*------------------------------------------------------------------------- @@ -6730,7 +6730,7 @@ out: H5Pclose(fcpl_id); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY } /*------------------------------------------------------------------------- @@ -6989,7 +6989,7 @@ out: H5Pclose(tcpl_id); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY } /*------------------------------------------------------------------------- @@ -11325,7 +11325,7 @@ error: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY } /* gen_err_attr_dspace() */ /* Structure to collect the onion filepaths in one place. */ @@ -11551,7 +11551,7 @@ error: H5Sclose(space); H5Fclose(file_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* gent_onion_1d_dset */ @@ -11988,7 +11988,7 @@ error: H5Pclose(fapl_id); H5Pclose(onion_info.backing_fapl_id); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* gent_onion_dset_extension */ diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c index 56287cf..5b8bfce 100644 --- a/tools/test/h5format_convert/h5fc_gentest.c +++ b/tools/test/h5format_convert/h5fc_gentest.c @@ -27,15 +27,15 @@ #define EDGE_V3_FILE "h5fc_edge_v3.h5" #define ERR_LEVEL_FILE "h5fc_err_level.h5" -const char *FILENAME[] = {"h5fc_ext1_i.h5", /* 0 */ - "h5fc_ext1_s.h5", /* 1 */ - "h5fc_ext1_f.h5", /* 2 */ - "h5fc_ext2_is.h5", /* 3 */ - "h5fc_ext2_if.h5", /* 4 */ - "h5fc_ext2_sf.h5", /* 5 */ - "h5fc_ext3_isf.h5", /* 6 */ - "h5fc_ext_none.h5", /* 7 */ - NULL}; +static const char *FILENAME[] = {"h5fc_ext1_i.h5", /* 0 */ + "h5fc_ext1_s.h5", /* 1 */ + "h5fc_ext1_f.h5", /* 2 */ + "h5fc_ext2_is.h5", /* 3 */ + "h5fc_ext2_if.h5", /* 4 */ + "h5fc_ext2_sf.h5", /* 5 */ + "h5fc_ext3_isf.h5", /* 6 */ + "h5fc_ext_none.h5", /* 7 */ + NULL}; #define GROUP "GROUP" @@ -293,7 +293,7 @@ error: H5Fclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY } /* gen_non() */ @@ -373,7 +373,7 @@ error: H5Fclose(fid); H5Pclose(fapl); } - H5E_END_TRY; + H5E_END_TRY } /* gen_edge() */ @@ -518,7 +518,7 @@ error: H5Pclose(fapl); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY } /* gen_err_level() */ @@ -774,7 +774,7 @@ error: H5Pclose(fapl); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY } /* end gen_ext() */ diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c index 1919e5b..003c343 100644 --- a/tools/test/h5import/h5importtest.c +++ b/tools/test/h5import/h5importtest.c @@ -167,7 +167,7 @@ main(void) (void)fprintf(sp, "\n"); } } - (void)HDfclose(sp); + (void)fclose(sp); /*------------------------------------------------------------------------- * TOOLTEST txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5 @@ -182,7 +182,7 @@ main(void) (void)fprintf(sp, "\n"); } } - (void)HDfclose(sp); + (void)fclose(sp); /*------------------------------------------------------------------------- * TOOLTEST txtin32.txt -c $srcdir/testfiles/textin32.conf -o textin32.h5 @@ -197,7 +197,7 @@ main(void) (void)fprintf(sp, "\n"); } } - (void)HDfclose(sp); + (void)fclose(sp); #endif /*------------------------------------------------------------------------- @@ -209,11 +209,11 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) { - (void)HDfwrite((char *)&b32i3[k][i][j], sizeof(int), 1, sp); + (void)fwrite((char *)&b32i3[k][i][j], sizeof(int), 1, sp); } } } - (void)HDfclose(sp); + (void)fclose(sp); sp = fopen("binin32.conf", "w"); (void)fprintf(sp, "PATH /int/bin/32-bit\n"); @@ -226,7 +226,7 @@ main(void) (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n"); (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n"); (void)fprintf(sp, "\n"); - (void)HDfclose(sp); + (void)fclose(sp); /*------------------------------------------------------------------------- * TOOLTEST binuin32.bin -c binuin32.conf -o binuin32.h5 @@ -237,11 +237,11 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) { - (void)HDfwrite((char *)&b32i3[k][i][j], sizeof(unsigned int), 1, sp); + (void)fwrite((char *)&b32i3[k][i][j], sizeof(unsigned int), 1, sp); } } } - (void)HDfclose(sp); + (void)fclose(sp); sp = fopen("binuin32.conf", "w"); (void)fprintf(sp, "PATH /int/buin/32-bit\n"); @@ -253,7 +253,7 @@ main(void) (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n"); (void)fprintf(sp, "\n"); - (void)HDfclose(sp); + (void)fclose(sp); /*------------------------------------------------------------------------- * TOOLTEST binin16.bin -c binin16.conf -o binin16.h5 @@ -264,11 +264,11 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) { - (void)HDfwrite((char *)&b16i3[k][i][j], sizeof(short), 1, sp); + (void)fwrite((char *)&b16i3[k][i][j], sizeof(short), 1, sp); } } } - (void)HDfclose(sp); + (void)fclose(sp); sp = fopen("binin16.conf", "w"); (void)fprintf(sp, "PATH /int/bin/16-bit\n"); @@ -282,7 +282,7 @@ main(void) (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n"); (void)fprintf(sp, "\n"); - (void)HDfclose(sp); + (void)fclose(sp); /*------------------------------------------------------------------------- * TOOLTEST binuin16.bin -c binuin16.conf -o binuin16.h5 @@ -292,11 +292,11 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) { - (void)HDfwrite((char *)&b16i3[k][i][j], sizeof(unsigned short), 1, sp); + (void)fwrite((char *)&b16i3[k][i][j], sizeof(unsigned short), 1, sp); } } } - (void)HDfclose(sp); + (void)fclose(sp); sp = fopen("binuin16.conf", "w"); (void)fprintf(sp, "PATH /int/buin/16-bit\n"); @@ -310,7 +310,7 @@ main(void) (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n"); (void)fprintf(sp, "\n"); - (void)HDfclose(sp); + (void)fclose(sp); /*------------------------------------------------------------------------- * TOOLTEST binin8.bin -c binin8.conf -o binin8.h5 @@ -321,11 +321,11 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) { - (void)HDfwrite((char *)&b8i3[k][i][j], sizeof(char), 1, sp); + (void)fwrite((char *)&b8i3[k][i][j], sizeof(char), 1, sp); } } } - (void)HDfclose(sp); + (void)fclose(sp); sp = fopen("binin8.conf", "w"); (void)fprintf(sp, "PATH /int/bin/8-bit\n"); @@ -342,7 +342,7 @@ main(void) (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n"); (void)fprintf(sp, "COMPRESSION-PARAM 3\n"); (void)fprintf(sp, "\n"); - (void)HDfclose(sp); + (void)fclose(sp); #endif /* UNICOS */ @@ -359,11 +359,11 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) { - (void)HDfwrite((char *)&b64r3[k][i][j], sizeof(double), 1, sp); + (void)fwrite((char *)&b64r3[k][i][j], sizeof(double), 1, sp); } } } - (void)HDfclose(sp); + (void)fclose(sp); sp = fopen("binfp64.conf", "w"); (void)fprintf(sp, "PATH /fp/bin/64-bit\n"); @@ -378,7 +378,7 @@ main(void) (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n"); (void)fprintf(sp, "COMPRESSION-PARAM 8\n"); (void)fprintf(sp, "\n"); - (void)HDfclose(sp); + (void)fclose(sp); /*------------------------------------------------------------------------- * TOOLTEST binin8w.bin -c binin8w.conf -o binin8w.h5 @@ -392,10 +392,10 @@ main(void) sp = fopen("binin8w.bin", OPEN_FLAGS); for (i = 0; i < 4; i++) { char c = bin8w[i]; - if (HDfwrite(&c, sizeof(char), 1, sp) != 1) + if (fwrite(&c, sizeof(char), 1, sp) != 1) printf("error writing file\n"); } - HDfclose(sp); + fclose(sp); sp = fopen("binin8w.conf", "w"); (void)fprintf(sp, "INPUT-CLASS IN\n"); @@ -408,7 +408,7 @@ main(void) (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); (void)fprintf(sp, "DIMENSION-SIZES 4\n"); (void)fprintf(sp, "\n"); - (void)HDfclose(sp); + (void)fclose(sp); } return (EXIT_SUCCESS); } diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c index 96ee5cd..b90ddeb 100644 --- a/tools/test/h5jam/getub.c +++ b/tools/test/h5jam/getub.c @@ -18,7 +18,7 @@ void parse_command_line(int argc, const char *const *argv); /* Name of tool */ #define PROGRAM_NAME "getub" -char *nbytes = NULL; +static char *nbytes = NULL; static const char *s_opts = "c:"; /* add more later ? */ static struct h5_long_options l_opts[] = {{"c", require_arg, 'c'}, /* input file */ diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c index 3bb332c..d3b7388 100644 --- a/tools/test/h5jam/h5jamgentest.c +++ b/tools/test/h5jam/h5jamgentest.c @@ -353,7 +353,7 @@ error: H5Sclose(space); H5Pclose(create_plist); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } diff --git a/tools/test/h5repack/dynlib_rpk.c b/tools/test/h5repack/dynlib_rpk.c index 739dbe0..0fc3c42 100644 --- a/tools/test/h5repack/dynlib_rpk.c +++ b/tools/test/h5repack/dynlib_rpk.c @@ -23,7 +23,7 @@ static size_t H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts, const uns size_t nbytes, size_t *buf_size, void **buf); /* This message derives from H5Z */ -const H5Z_class2_t H5Z_DYNLIB1[1] = {{ +static const H5Z_class2_t H5Z_DYNLIB1[1] = {{ H5Z_CLASS_T_VERS, /* H5Z_class_t version */ H5Z_FILTER_DYNLIB1, /* Filter id number */ 1, 1, /* Encoding and decoding enabled */ diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c index 5cd6fe3..00a7ae2 100644 --- a/tools/test/h5repack/h5repacktst.c +++ b/tools/test/h5repack/h5repacktst.c @@ -17,10 +17,10 @@ #include "h5tools_utils.h" #define GOERROR \ - { \ + do { \ H5_FAILED(); \ goto error; \ - } + } while (0) /* fill value test */ #define FNAME0 "h5repack_fill.h5" @@ -82,7 +82,7 @@ /* Files for testing file space paging */ #define FSPACE_OUT "h5repack_fspace_OUT.h5" /* The output file */ #define NELMTS(X) (sizeof(X) / sizeof(X[0])) /* # of elements */ -const char *H5REPACK_FSPACE_FNAMES[] = { +static const char *H5REPACK_FSPACE_FNAMES[] = { "h5repack_latest.h5", /* 0 */ "h5repack_default.h5", /* 1 */ "h5repack_page_persist.h5", /* 2 */ @@ -101,7 +101,7 @@ const char *H5REPACK_FSPACE_FNAMES[] = { /* obj and region references in attr of compound and vlen type */ #define FNAME_ATTR_REF "h5repack_attr_refs.h5" -const char *H5REPACK_FILENAMES[] = {"h5repack_big_out", NULL}; +static const char *H5REPACK_FILENAMES[] = {"h5repack_big_out", NULL}; #define H5REPACK_EXTFILE "h5repack_ext.bin" @@ -2303,7 +2303,7 @@ out: H5Tclose(tid); H5Pclose(gcplid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -2373,7 +2373,7 @@ out: H5Gclose(rid); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -2441,7 +2441,7 @@ out: H5Gclose(g2id); H5Gclose(g3id); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -2515,7 +2515,7 @@ error: H5Pclose(dcpl); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -2600,7 +2600,7 @@ error: H5Pclose(dcpl); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -2670,7 +2670,7 @@ error: H5Pclose(dcpl); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -2743,7 +2743,7 @@ error: H5Pclose(dcpl); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -2851,7 +2851,7 @@ error: H5Sclose(sid); H5Dclose(dsid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -2953,7 +2953,7 @@ error: H5Pclose(dcpl); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -3137,7 +3137,7 @@ error: H5Pclose(dcpl); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -3235,7 +3235,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -3331,7 +3331,7 @@ error: H5Pclose(dcpl); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -3404,7 +3404,7 @@ error: H5Sclose(s_sid); } - H5E_END_TRY; + H5E_END_TRY free(s_buf); @@ -3547,7 +3547,7 @@ error: H5Pclose(dcpl2); H5Pclose(dcpl3); } - H5E_END_TRY; + H5E_END_TRY free(buf1); free(buf2); @@ -3604,7 +3604,7 @@ out: H5Sclose(sid); H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -3686,7 +3686,7 @@ out: H5Sclose(m_sid); H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -3740,7 +3740,7 @@ out: H5Sclose(sid); H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -3800,7 +3800,7 @@ out: H5Pclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (fd >= 0) HDclose(fd); @@ -3870,7 +3870,7 @@ out: H5Pclose(fcpl); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (fd >= 0) HDclose(fd); @@ -4095,9 +4095,11 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da */ if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0) goto out; - if (H5Tenum_insert(tid, "RED", (val = 0, &val)) < 0) + val = 0; + if (H5Tenum_insert(tid, "RED", &val) < 0) goto out; - if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0) + val = 1; + if (H5Tenum_insert(tid, "GREEN", &val) < 0) goto out; if (write_dset(loc_id, 1, dims, "enum", tid, buf45) < 0) goto out; @@ -4319,9 +4321,11 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0) goto out; - if (H5Tenum_insert(tid, "RED", (val = 0, &val)) < 0) + val = 0; + if (H5Tenum_insert(tid, "RED", &val) < 0) goto out; - if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0) + val = 1; + if (H5Tenum_insert(tid, "GREEN", &val) < 0) goto out; if (write_dset(loc_id, 2, dims2, "enum2D", tid, 0) < 0) goto out; @@ -4527,9 +4531,11 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0) goto out; - if (H5Tenum_insert(tid, "RED", (val = 0, &val)) < 0) + val = 0; + if (H5Tenum_insert(tid, "RED", &val) < 0) goto out; - if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0) + val = 1; + if (H5Tenum_insert(tid, "GREEN", &val) < 0) goto out; if (write_dset(loc_id, 3, dims3, "enum3D", tid, 0) < 0) goto out; @@ -4636,7 +4642,7 @@ out: H5Dclose(did); H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -4745,7 +4751,7 @@ out: H5Dclose(did1); H5Dclose(did2); } - H5E_END_TRY; + H5E_END_TRY return retval; } @@ -4982,9 +4988,11 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da */ if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0) goto out; - if (H5Tenum_insert(tid, "RED", (val = 0, &val)) < 0) + val = 0; + if (H5Tenum_insert(tid, "RED", &val) < 0) goto out; - if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0) + val = 1; + if (H5Tenum_insert(tid, "GREEN", &val) < 0) goto out; if (make_attr(loc_id, 1, dims, "enum", tid, buf45) < 0) goto out; @@ -5285,9 +5293,11 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0) goto out; - if (H5Tenum_insert(tid, "RED", (val = 0, &val)) < 0) + val = 0; + if (H5Tenum_insert(tid, "RED", &val) < 0) goto out; - if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0) + val = 1; + if (H5Tenum_insert(tid, "GREEN", &val) < 0) goto out; if (make_attr(loc_id, 2, dims2, "enum2D", tid, buf452) < 0) goto out; @@ -5729,9 +5739,11 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0) goto out; - if (H5Tenum_insert(tid, "RED", (val = 0, &val)) < 0) + val = 0; + if (H5Tenum_insert(tid, "RED", &val) < 0) goto out; - if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0) + val = 1; + if (H5Tenum_insert(tid, "GREEN", &val) < 0) goto out; if (make_attr(loc_id, 3, dims3, "enum3D", tid, buf453) < 0) goto out; @@ -5880,7 +5892,7 @@ out: H5Sclose(sid); H5Tclose(tid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -5929,7 +5941,7 @@ out: { H5Dclose(did); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -5987,7 +5999,7 @@ out: H5Dclose(did); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -6024,7 +6036,7 @@ out: H5Aclose(aid); H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return -1; } @@ -6150,7 +6162,7 @@ out: H5Dclose(did); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY return -1; } /* end make_named_dtype() */ diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c index acd3a03..44428fe 100644 --- a/tools/test/h5stat/h5stat_gentest.c +++ b/tools/test/h5stat/h5stat_gentest.c @@ -143,7 +143,7 @@ error: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } /* gen_newgrat_file() */ @@ -348,7 +348,7 @@ error: H5Sclose(sid4); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -453,7 +453,7 @@ error: H5Dclose(did2); #endif } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -575,7 +575,7 @@ error: H5Aclose(aid2); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (fd >= 0) HDclose(fd); diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c index 0b71b23..5cb7aa2 100644 --- a/tools/test/misc/h5clear_gentest.c +++ b/tools/test/misc/h5clear_gentest.c @@ -13,7 +13,7 @@ #include "h5test.h" /* The HDF5 test files */ -const char *FILENAME[] = { +static const char *FILENAME[] = { "h5clear_sec2_v3.h5", /* 0 -- sec2 file with superblock version 3 */ "h5clear_log_v3.h5", /* 1 -- log file with superblock version 3 */ "h5clear_sec2_v0.h5", /* 2 -- sec2 file with superblock version 0 */ @@ -136,7 +136,7 @@ error: H5Pclose(fapl); H5Pclose(dcpl); } - H5E_END_TRY; + H5E_END_TRY free(buf); @@ -309,7 +309,7 @@ error: H5Fclose(fid); H5Pclose(fcpl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* gen_enhance_files() */ diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c index 5951fd2..3857ee2 100644 --- a/tools/test/misc/repart_test.c +++ b/tools/test/misc/repart_test.c @@ -22,8 +22,8 @@ #define FAMILY_H5REPART_SIZE1 20000 #define FAMILY_H5REPART_SIZE2 (5 * KB) -const char *FILENAME[] = {"fst_family%05d.h5", "scd_family%05d.h5", "family_to_single.h5", - "family_to_sec2.h5", NULL}; +static const char *FILENAME[] = {"fst_family%05d.h5", "scd_family%05d.h5", "family_to_single.h5", + "family_to_sec2.h5", NULL}; herr_t test_family_h5repart_opens(void); herr_t test_single_h5repart_opens(void); @@ -77,7 +77,7 @@ error: H5Pclose(fapl_id); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; @@ -116,7 +116,7 @@ error: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c index f8fe076..805b30b 100644 --- a/tools/test/misc/talign.c +++ b/tools/test/misc/talign.c @@ -66,7 +66,7 @@ main(void) { (void)H5Ldelete(fil, setname, H5P_DEFAULT); } - H5E_END_TRY; + H5E_END_TRY cs6 = H5Tcopy(H5T_C_S1); H5Tset_size(cs6, sizeof(string5)); diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/testfiles/h5mkgrp_help.txt index 5d81b34..d01fbee 100644 --- a/tools/test/misc/testfiles/h5mkgrp_help.txt +++ b/tools/test/misc/testfiles/h5mkgrp_help.txt @@ -11,6 +11,9 @@ usage: h5mkgrp [OPTIONS] FILE GROUP... HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/test/perform/chunk.c b/tools/test/perform/chunk.c index da09639..665c857 100644 --- a/tools/test/perform/chunk.c +++ b/tools/test/perform/chunk.c @@ -72,7 +72,7 @@ static size_t counter(unsigned H5_ATTR_UNUSED flags, size_t cd_nelmts, const uns size_t nbytes, size_t *buf_size, void **buf); /* This message derives from H5Z */ -const H5Z_class2_t H5Z_COUNTER[1] = {{ +static const H5Z_class2_t H5Z_COUNTER[1] = {{ H5Z_CLASS_T_VERS, /* H5Z_class_t version */ FILTER_COUNTER, /* Filter id number */ 1, 1, /* Encoding and decoding enabled */ diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c index 289d7c0..3d258ea 100644 --- a/tools/test/perform/chunk_cache.c +++ b/tools/test/perform/chunk_cache.c @@ -53,7 +53,7 @@ static size_t counter(unsigned flags, size_t cd_nelmts, const unsigned *cd_value size_t *buf_size, void **buf); /* This message derives from H5Z */ -const H5Z_class2_t H5Z_COUNTER[1] = {{ +static const H5Z_class2_t H5Z_COUNTER[1] = {{ H5Z_CLASS_T_VERS, /* H5Z_class_t version */ FILTER_COUNTER, /* Filter id number */ 1, 1, /* Encoding and decoding enabled */ @@ -144,7 +144,7 @@ error: H5Pclose(dcpl); H5Sclose(dataspace); } - H5E_END_TRY; + H5E_END_TRY free(data); return 1; @@ -209,7 +209,7 @@ error: H5Pclose(dcpl); H5Sclose(dataspace); } - H5E_END_TRY; + H5E_END_TRY free(data); return 1; @@ -285,7 +285,7 @@ error: H5Sclose(memspace); H5Pclose(dapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -363,7 +363,7 @@ error: H5Sclose(memspace); H5Pclose(dapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c index 7772324..be9d583 100644 --- a/tools/test/perform/direct_write_perf.c +++ b/tools/test/perform/direct_write_perf.c @@ -45,7 +45,7 @@ #include <unistd.h> #endif -const char *FILENAME[] = {"direct_write", "unix.raw", NULL}; +static const char *FILENAME[] = {"direct_write", "unix.raw", NULL}; /* * Print the current location on the standard output stream. @@ -272,7 +272,7 @@ error: H5Pclose(cparms); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -338,7 +338,7 @@ error: H5Pclose(dxpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -403,7 +403,7 @@ error: H5Pclose(dxpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -495,7 +495,7 @@ error: H5Pclose(dxpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } @@ -587,7 +587,7 @@ error: H5Pclose(dxpl); H5Fclose(file); } - H5E_END_TRY; + H5E_END_TRY return 1; } diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c index 02b1350..bc15fdf 100644 --- a/tools/test/perform/iopipe.c +++ b/tools/test/perform/iopipe.c @@ -88,10 +88,10 @@ synchronize(void) #else int H5_ATTR_NDEBUG_UNUSED status; - status = HDsystem("sync"); + status = system("sync"); assert(status >= 0); - status = HDsystem("df >/dev/null"); + status = system("df >/dev/null"); assert(status >= 0); #endif } @@ -153,7 +153,7 @@ main(void) /* Fill raw */ synchronize(); #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_start); + getrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); fprintf(stderr, HEADING, "fill raw"); @@ -163,7 +163,7 @@ main(void) memset(the_data, 0xAA, (size_t)(size[0] * size[1])); } #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_stop); + getrusage(RUSAGE_SELF, &r_stop); #endif t_stop = H5_get_time(); HDputc('\n', stderr); @@ -176,7 +176,7 @@ main(void) /* Fill hdf5 */ synchronize(); #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_start); + getrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); fprintf(stderr, HEADING, "fill hdf5"); @@ -187,7 +187,7 @@ main(void) assert(status >= 0); } #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_stop); + getrusage(RUSAGE_SELF, &r_stop); #endif t_stop = H5_get_time(); HDputc('\n', stderr); @@ -200,7 +200,7 @@ main(void) /* Write the raw dataset */ synchronize(); #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_start); + getrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); fprintf(stderr, HEADING, "out raw"); @@ -213,7 +213,7 @@ main(void) assert(n >= 0 && (size_t)n == (size[0] * size[1])); } #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_stop); + getrusage(RUSAGE_SELF, &r_stop); #endif t_stop = H5_get_time(); HDputc('\n', stderr); @@ -226,7 +226,7 @@ main(void) /* Write the hdf5 dataset */ synchronize(); #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_start); + getrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); fprintf(stderr, HEADING, "out hdf5"); @@ -237,7 +237,7 @@ main(void) assert(status >= 0); } #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_stop); + getrusage(RUSAGE_SELF, &r_stop); #endif t_stop = H5_get_time(); HDputc('\n', stderr); @@ -250,7 +250,7 @@ main(void) /* Read the raw dataset */ synchronize(); #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_start); + getrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); fprintf(stderr, HEADING, "in raw"); @@ -263,7 +263,7 @@ main(void) assert(n >= 0 && (size_t)n == (size[0] * size[1])); } #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_stop); + getrusage(RUSAGE_SELF, &r_stop); #endif t_stop = H5_get_time(); HDputc('\n', stderr); @@ -276,7 +276,7 @@ main(void) /* Read the hdf5 dataset */ synchronize(); #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_start); + getrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); fprintf(stderr, HEADING, "in hdf5"); @@ -287,7 +287,7 @@ main(void) assert(status >= 0); } #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_stop); + getrusage(RUSAGE_SELF, &r_stop); #endif t_stop = H5_get_time(); HDputc('\n', stderr); @@ -305,7 +305,7 @@ main(void) assert(status >= 0); synchronize(); #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_start); + getrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); fprintf(stderr, HEADING, "in hdf5 partial"); @@ -316,7 +316,7 @@ main(void) assert(status >= 0); } #ifdef H5_HAVE_GETRUSAGE - HDgetrusage(RUSAGE_SELF, &r_stop); + getrusage(RUSAGE_SELF, &r_stop); #endif t_stop = H5_get_time(); HDputc('\n', stderr); diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c index 5844126..16df60a 100644 --- a/tools/test/perform/perf_meta.c +++ b/tools/test/perform/perf_meta.c @@ -25,25 +25,25 @@ #define FACC_MPIO 0x1 /* MPIO */ /* Which test to run */ -int RUN_TEST = 0x0; /* all tests as default */ -int TEST_1 = 0x1; /* Test 1 */ -int TEST_2 = 0x2; /* Test 2 */ -int TEST_3 = 0x4; /* Test 3 */ +static int RUN_TEST = 0x0; /* all tests as default */ +static int TEST_1 = 0x1; /* Test 1 */ +static int TEST_2 = 0x2; /* Test 2 */ +static int TEST_3 = 0x4; /* Test 3 */ -const char *FILENAME[] = {"meta_perf_1", "meta_perf_2", "meta_perf_3", NULL}; +static const char *FILENAME[] = {"meta_perf_1", "meta_perf_2", "meta_perf_3", NULL}; /* Default values for performance. Can be changed through command line options */ -int NUM_DSETS = 16; -int NUM_ATTRS = 8; -int BATCH_ATTRS = 2; -hbool_t flush_dset = FALSE; -hbool_t flush_attr = FALSE; -int nerrors = 0; /* errors count */ -hid_t fapl; +static int NUM_DSETS = 16; +static int NUM_ATTRS = 8; +static int BATCH_ATTRS = 2; +static hbool_t flush_dset = FALSE; +static hbool_t flush_attr = FALSE; +static int nerrors = 0; /* errors count */ +static hid_t fapl; /* Data space IDs */ -hid_t space; -hid_t small_space; +static hid_t space; +static hid_t small_space; /* Performance data */ typedef struct p_time { @@ -56,7 +56,7 @@ typedef struct p_time { } p_time; /*Test file access type for parallel. MPIO as default */ -int facc_type = FACC_DEFAULT; +static int facc_type = FACC_DEFAULT; double retrieve_time(void); void perf(p_time *perf_t, double start_t, double end_t); diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c index 2a794be..b8b80e8 100644 --- a/tools/test/perform/zip_perf.c +++ b/tools/test/perform/zip_perf.c @@ -274,7 +274,7 @@ parse_size_directive(const char *size) unsigned long s; char *endptr; - s = HDstrtoul(size, &endptr, 10); + s = strtoul(size, &endptr, 10); if (endptr && *endptr) { while (*endptr != '\0' && (*endptr == ' ' || *endptr == '\t')) @@ -488,7 +488,7 @@ main(int argc, char *argv[]) min_buf_size = parse_size_directive(H5_optarg); break; case 'c': - compress_percent = (int)HDstrtol(H5_optarg, NULL, 10); + compress_percent = (int)strtol(H5_optarg, NULL, 10); if (compress_percent < 0) compress_percent = 0; |