summaryrefslogtreecommitdiffstats
path: root/tools/test/h5repack/h5repacktst.c
diff options
context:
space:
mode:
authorSean McBride <sean@rogue-research.com>2023-06-19 05:13:38 (GMT)
committerGitHub <noreply@github.com>2023-06-19 05:13:38 (GMT)
commit65d8c9347010771473b53c91adcec2f281772213 (patch)
tree487567dae0dc005de896f616b90e67744239a5e2 /tools/test/h5repack/h5repacktst.c
parent1f20354ee6cdfa9fd157ac9cdfff9acdf320a32d (diff)
downloadhdf5-65d8c9347010771473b53c91adcec2f281772213.zip
hdf5-65d8c9347010771473b53c91adcec2f281772213.tar.gz
hdf5-65d8c9347010771473b53c91adcec2f281772213.tar.bz2
Many fixes to various compiler warnings (#3124)
* Fixed various -Wmissing-variable-declarations by adding static keyword * In a few cases, renamed the variable suffix from _g to _s. * Fixed some -Wmissing-variable-declarations by using different declaration macros * Fixed various -Wconditional-uninitialized warnings by just initializing variable to zero * Fixed various -Wcomma warnings * Fixed clang -Wstrict-prototypes warnings * Fixed various -Wunused-variable warnings * Updated some casts to fix the only 3 -Wcast-qual warnings * Fixed the only -Wsometimes-uninitialized warning
Diffstat (limited to 'tools/test/h5repack/h5repacktst.c')
-rw-r--r--tools/test/h5repack/h5repacktst.c40
1 files changed, 26 insertions, 14 deletions
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index fc0fe54..cbb5f8f 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -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"
@@ -4099,9 +4099,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;
@@ -4323,9 +4325,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;
@@ -4531,9 +4535,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;
@@ -4990,9 +4996,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;
@@ -5293,9 +5301,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;
@@ -5737,9 +5747,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;