summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorSean McBride <sean@rogue-research.com>2021-03-04 21:06:30 (GMT)
committerGitHub <noreply@github.com>2021-03-04 21:06:30 (GMT)
commit580008d5bb39e3a9a4a92aefe06dce6941cd485b (patch)
tree449ff31910ac3efa9307c932b5f93f354ff14e94 /hl
parentfb210fc4fd70ce68b95a08f91eee2580552b6d21 (diff)
downloadhdf5-580008d5bb39e3a9a4a92aefe06dce6941cd485b.zip
hdf5-580008d5bb39e3a9a4a92aefe06dce6941cd485b.tar.gz
hdf5-580008d5bb39e3a9a4a92aefe06dce6941cd485b.tar.bz2
More warning fixes (#400)
* Fixed -Wunused-local-typedef warning * Fixed -Wformat warnings In one case also removed a `z` character. There was a `z%d` that I think was supposed to be `%zd` * Fixed -Wshorten-64-to-32 warnings * Fixed -Wself-assign warnings * Fixed -Wreserved-id-macro warnings * Commit format changes from clang-format, clang version 10.0.1. * Fixed -Wself-assign warnings * Fixed -Wunused-local-typedef warning * Fixed -Wformat warnings In two cases also removed a `z` character. There was a `z%d` that was supposed to be `%zd`. * Fixed -Wshorten-64-to-32 warnings * Fixed -Wreserved-id-macro warnings * Fixed -Wself-assign warnings * Format source. * Remove blank lines to pass format check. Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Diffstat (limited to 'hl')
-rw-r--r--hl/c++/test/ptableTest.cpp4
-rw-r--r--hl/src/H5IM.c5
-rw-r--r--hl/src/H5LT.c8
-rw-r--r--hl/test/test_ds.c24
4 files changed, 27 insertions, 14 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index bf60402..900f8a9 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -616,11 +616,11 @@ TestHDFFV_9758()
s1_t s1[NUM_PACKETS];
for (hsize_t i = 0; i < NUM_PACKETS; i++) {
- s1[i].a = i;
+ s1[i].a = static_cast<int>(i);
s1[i].b = 1.f * static_cast<float>(i * i);
s1[i].c = 1. / (i + 1);
HDsprintf(s1[i].d, "string%d", (int)i);
- s1[i].e = 100 + i;
+ s1[i].e = static_cast<int>(100 + i);
}
printf("Testing %-62s", "data corruption in packed structs (HDFFV-9758)");
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 310d665..ff10d57 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -169,6 +169,11 @@ find_palette(H5_ATTR_UNUSED hid_t loc_id, const char *name, H5_ATTR_UNUSED const
if (name == NULL)
return -1;
+ /* Shut compiler up */
+ (void)loc_id;
+ (void)ainfo;
+ (void)op_data;
+
/* Define a positive value for return value if the attribute was found. This will
* cause the iterator to immediately return that positive value,
* indicating short-circuit success
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 6478a96..d1d3648 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -1309,6 +1309,10 @@ find_dataset(H5_ATTR_UNUSED hid_t loc_id, const char *name, H5_ATTR_UNUSED const
if (name == NULL)
return ret;
+ /* Shut the compiler up */
+ (void)loc_id;
+ (void)linfo;
+
/* Define a positive value for return value if the dataset was found. This will
* cause the iterator to immediately return that positive value,
* indicating short-circuit success
@@ -1847,6 +1851,10 @@ find_attr(H5_ATTR_UNUSED hid_t loc_id, const char *name, H5_ATTR_UNUSED const H5
if (name == NULL)
return H5_ITER_CONT;
+ /* Shut compiler up */
+ (void)loc_id;
+ (void)ainfo;
+
/* Define a positive value for return value if the attribute was found. This will
* cause the iterator to immediately return that positive value,
* indicating short-circuit success
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 90110a4..20e3e82 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -3554,9 +3554,9 @@ verify_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
int ret = 0;
/* unused */
- dset = dset;
- dim = dim;
- visitor_data = visitor_data;
+ (void)dset;
+ (void)dim;
+ (void)visitor_data;
/* define a positive value for return value. This will cause the iterator to
immediately return that positive value, indicating short-circuit success
@@ -3602,8 +3602,8 @@ read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
char * data = (char *)visitor_data;
/* unused */
- dset = dset;
- dim = dim;
+ (void)dset;
+ (void)dim;
/* get space */
if ((sid = H5Dget_space(scale_id)) < 0)
@@ -3691,7 +3691,7 @@ match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor_data)
hsize_t storage_size;
/* Stop compiler from whining about "unused parameters" */
- visitor_data = visitor_data;
+ (void)visitor_data;
/*-------------------------------------------------------------------------
* get DID (dataset) space info
@@ -3766,9 +3766,9 @@ static herr_t
op_continue(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
{
/* Stop compiler from whining about "unused parameters" */
- dset = dset;
- dim = dim;
- scale_id = scale_id;
+ (void)dset;
+ (void)dim;
+ (void)scale_id;
if (visitor_data != NULL) {
(*(int *)visitor_data)++;
@@ -3799,9 +3799,9 @@ static herr_t
op_stop(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
{
/* Stop compiler from whining about "unused parameters" */
- dset = dset;
- dim = dim;
- scale_id = scale_id;
+ (void)dset;
+ (void)dim;
+ (void)scale_id;
if (visitor_data != NULL) {
(*(int *)visitor_data)++;