Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc warning fixes #495

Merged
merged 8 commits into from
Mar 24, 2021
+73 −61
Merged

Misc warning fixes #495

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba9deae
Committing clang-format changes
github-actions[bot] Mar 19, 2021
00f9750
Merge remote-tracking branch 'canonical/develop' into develop
Mar 21, 2021
2edae83
Misc warning fixes from Visual Studio
Mar 22, 2021
2a31a14
Committing clang-format changes
github-actions[bot] Mar 22, 2021
8c12e27
Fixes warnings in swmr.c test
Mar 22, 2021
8e83b23
Merge branch 'trivial/misc_msvc_warnings' of https://github.com/derob…
Mar 22, 2021
41ba92c
Committing clang-format changes
github-actions[bot] Mar 22, 2021
0a81190
Merge branch 'develop' into trivial/misc_msvc_warnings
derobins Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/H5Tconv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3843,7 +3843,7 @@ H5T__conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz
size_t half_size; /*half the type size */
size_t olap; /*num overlapping elements */
uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t dbuf[64] = {0}; /*temp destination buffer */
size_t first;
ssize_t sfirst; /*a signed version of `first' */
Expand Down Expand Up @@ -4286,7 +4286,7 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz
size_t olap; /*num overlapping elements */
ssize_t bitno = 0; /*bit number */
uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t dbuf[64] = {0}; /*temp destination buffer */
uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/

Expand Down Expand Up @@ -8401,7 +8401,7 @@ H5T__conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz
size_t tsize; /*type size for swapping bytes */
size_t olap; /*num overlapping elements */
uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t dbuf[64] = {0}; /*temp destination buffer */
uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/

Expand Down Expand Up @@ -9027,7 +9027,7 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz
size_t tsize; /*type size for swapping bytes */
size_t olap; /*num overlapping elements */
uint8_t * s, *sp, *d, *dp; /*source and dest traversal ptrs*/
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t * src_rev = NULL; /*order-reversed source buffer */
uint8_t dbuf[64] = {0}; /*temp destination buffer */
uint8_t tmp1, tmp2; /*temp variables for swapping bytes*/

Expand Down
4 changes: 2 additions & 2 deletions src/H5system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,8 @@ Wgetlogin(void)
{

#ifdef H5_HAVE_WINSOCK2_H
long bufferCount = WloginBuffer_count;
if (GetUserName(Wlogin_buffer, &bufferCount) == 0)
DWORD bufferCount = WloginBuffer_count;
if (GetUserName(Wlogin_buffer, &bufferCount) != 0)
return (Wlogin_buffer);
else
#endif /* H5_HAVE_WINSOCK2_H */
Expand Down
2 changes: 1 addition & 1 deletion src/H5trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3884,7 +3884,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
FILE * out = H5_debug_g.trace;
static hbool_t is_first_invocation = TRUE;
H5_timer_t function_timer = {{0}, {0}, {0}, FALSE};
H5_timevals_t function_times;
H5_timevals_t function_times = {0.0, 0.0, 0.0};
static H5_timer_t running_timer;
H5_timevals_t running_times;
static int current_depth = 0;
Expand Down
8 changes: 6 additions & 2 deletions src/H5win32defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,12 @@ H5_DLL float Wroundf(float arg);
#define HDsetenv(N, V, O) Wsetenv(N, V, O)
#define HDflock(F, L) Wflock(F, L)
#define HDgetlogin() Wgetlogin()
#define HDsnprintf c99_snprintf /*varargs*/
#define HDvsnprintf c99_vsnprintf /*varargs*/

/* VS 2015 introduced C99-compliant versions of these functions */
#if (_MSC_VER < 1900)
#define HDsnprintf c99_snprintf /*varargs*/
#define HDvsnprintf c99_vsnprintf /*varargs*/
#endif

/* Non-POSIX functions */

Expand Down
34 changes: 23 additions & 11 deletions test/swmr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,14 +847,17 @@ test_metadata_read_attempts(hid_t in_fapl)
static int
test_metadata_read_retry_info(hid_t in_fapl)
{
hid_t fapl, new_fapl; /* File access property list */
hid_t fid, fid1; /* File IDs */
hid_t fapl = H5I_INVALID_HID; /* File access property list */
hid_t new_fapl = H5I_INVALID_HID; /* File access property list */
hid_t fid = H5I_INVALID_HID; /* File ID */
hid_t fid1 = H5I_INVALID_HID; /* File ID */
H5F_retry_info_t info, info1; /* The collection of metadata retries */
H5F_t * f = NULL, *f1 = NULL; /* Internal file object pointers */
unsigned i, j, n; /* Local index variables */
hid_t did1, did2; /* Dataset IDs */
hid_t sid; /* Dataspace ID */
hid_t dcpl; /* Dataset creation property list */
hid_t did1 = H5I_INVALID_HID; /* Dataset ID */
hid_t did2 = H5I_INVALID_HID; /* Dataset ID */
hid_t sid = H5I_INVALID_HID; /* Dataspace ID */
hid_t dcpl = H5I_INVALID_HID; /* Dataset creation property list */
hsize_t dims[2] = {6, 10}; /* Dataset dimensions */
char filename[NAME_BUF_SIZE]; /* File name */
int buf[6][10], chkbuf1[6][10], chkbuf2[6][10]; /* Buffers for data */
Expand Down Expand Up @@ -1623,7 +1626,7 @@ test_start_swmr_write(hid_t in_fapl, hbool_t new_format)
FAIL_STACK_ERROR

/* Should be 100 */
if (attempts != (new_format ? H5F_METADATA_READ_ATTEMPTS : H5F_SWMR_METADATA_READ_ATTEMPTS))
if (attempts != (unsigned int)(new_format ? H5F_METADATA_READ_ATTEMPTS : H5F_SWMR_METADATA_READ_ATTEMPTS))
TEST_ERROR;

/* Close the property list */
Expand Down Expand Up @@ -4499,8 +4502,9 @@ test_file_lock_same(hid_t in_fapl)
static int
test_file_lock_swmr_same(hid_t in_fapl)
{
hid_t fid, fid2; /* File IDs */
hid_t fapl; /* File access property list */
hid_t fid = H5I_INVALID_HID; /* File IDs */
hid_t fid2 = H5I_INVALID_HID;
hid_t fapl = H5I_INVALID_HID; /* File access property list */
char filename[NAME_BUF_SIZE]; /* file name */

/* Output message about test being performed */
Expand Down Expand Up @@ -6556,10 +6560,18 @@ test_swmr_vfd_flag(void)
static int
test_bug_refresh(hid_t in_fapl)
{
hid_t fid = -1; /* File ID */
hid_t fapl;
hid_t fid = H5I_INVALID_HID;
hid_t fapl = H5I_INVALID_HID;
H5F_t *f;
hid_t gid1, gid2, gid3, gid4, gid5, gid6, gid7, gid8, gid9;
hid_t gid1 = H5I_INVALID_HID;
hid_t gid2 = H5I_INVALID_HID;
hid_t gid3 = H5I_INVALID_HID;
hid_t gid4 = H5I_INVALID_HID;
hid_t gid5 = H5I_INVALID_HID;
hid_t gid6 = H5I_INVALID_HID;
hid_t gid7 = H5I_INVALID_HID;
hid_t gid8 = H5I_INVALID_HID;
hid_t gid9 = H5I_INVALID_HID;
char filename[NAME_BUF_SIZE]; /* File name */

/* Create a copy of the input parameter in_fapl */
Expand Down
48 changes: 24 additions & 24 deletions test/tfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5806,7 +5806,7 @@ test_libver_bounds_super_create(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t n
/* Get the internal file pointer if the create succeeds */
if (fid >= 0) {
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");
}

/* Retrieve the low/high bounds */
Expand Down Expand Up @@ -5982,7 +5982,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non

/* Get the internal file pointer */
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");

/* The file's superblock version */
super_vers = f->shared->sblock->super_vers;
Expand Down Expand Up @@ -6023,7 +6023,7 @@ test_libver_bounds_super_open(hid_t fapl, hid_t fcpl, htri_t is_swmr, htri_t non
/* Get the internal file pointer if the open succeeds */
if (fid >= 0) {
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");
}

/* Verify the file open succeeds or fails */
Expand Down Expand Up @@ -6201,7 +6201,7 @@ test_libver_bounds_obj(hid_t fapl)

/* Get the internal file pointer */
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");

/* Create a group in the file */
gid = H5Gcreate2(fid, GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
Expand Down Expand Up @@ -6309,7 +6309,7 @@ test_libver_bounds_dataset(hid_t fapl)

/* Get the internal dataset pointer */
dset = (H5D_t *)H5VL_object(did);
CHECK(dset, NULL, "H5VL_object");
CHECK_PTR(dset, "H5VL_object");

/* Verify version for layout and fill value messages */
if (low == H5F_LIBVER_EARLIEST) {
Expand Down Expand Up @@ -6357,7 +6357,7 @@ test_libver_bounds_dataset(hid_t fapl)

/* Get the internal dataset pointer */
dset = (H5D_t *)H5VL_object(did);
CHECK(dset, NULL, "H5VL_object");
CHECK_PTR(dset, "H5VL_object");

/* Verify layout message version and chunk indexing type */
VERIFY(dset->shared->layout.version, H5O_LAYOUT_VERSION_4, "H5O_layout_ver_bounds");
Expand Down Expand Up @@ -6419,15 +6419,15 @@ test_libver_bounds_dataset(hid_t fapl)

/* Get the internal file pointer */
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");

/* Create the chunked dataset */
did = H5Dcreate2(fid, DSETC, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
CHECK(did, H5I_INVALID_HID, "H5Dcreate2");

/* Get the internal file pointer */
dset = (H5D_t *)H5VL_object(did);
CHECK(dset, NULL, "H5VL_object");
CHECK_PTR(dset, "H5VL_object");

/* Verify the dataset's layout, fill value and filter pipeline message versions */
/* Also verify the chunk indexing type */
Expand Down Expand Up @@ -6548,7 +6548,7 @@ test_libver_bounds_dataspace(hid_t fapl)
sid = H5Dget_space(did);
CHECK(sid, H5I_INVALID_HID, "H5Dget_space");
space = (H5S_t *)H5I_object(sid);
CHECK(space, NULL, "H5I_object");
CHECK_PTR(space, "H5I_object");

/* Verify the dataspace version */
VERIFY(space->extent.version, H5O_sdspace_ver_bounds[low], "H5O_sdspace_ver_bounds");
Expand All @@ -6565,7 +6565,7 @@ test_libver_bounds_dataspace(hid_t fapl)
sid_null = H5Dget_space(did_null);
CHECK(sid_null, H5I_INVALID_HID, "H5Dget_space");
space_null = (H5S_t *)H5I_object(sid_null);
CHECK(space_null, NULL, "H5I_object");
CHECK_PTR(space_null, "H5I_object");

/* Verify the dataspace version */
VERIFY(space_null->extent.version, H5O_SDSPACE_VERSION_2, "H5O_sdspace_ver_bounds");
Expand Down Expand Up @@ -6643,7 +6643,7 @@ test_libver_bounds_dataspace(hid_t fapl)

/* Get the internal file pointer */
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");

/* Create the chunked dataset */
did = H5Dcreate2(fid, DSETA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT);
Expand All @@ -6653,7 +6653,7 @@ test_libver_bounds_dataspace(hid_t fapl)
tmp_sid = H5Dget_space(did);
CHECK(tmp_sid, H5I_INVALID_HID, "H5Dget_space");
tmp_space = (H5S_t *)H5I_object(tmp_sid);
CHECK(tmp_space, NULL, "H5I_object");
CHECK_PTR(tmp_space, "H5I_object");

/* Create the compact dataset */
did_compact = H5Dcreate2(fid, DSETB, H5T_NATIVE_INT, sid_compact, H5P_DEFAULT, dcpl_compact,
Expand All @@ -6664,7 +6664,7 @@ test_libver_bounds_dataspace(hid_t fapl)
tmp_sid_compact = H5Dget_space(did_compact);
CHECK(tmp_sid_compact, H5I_INVALID_HID, "H5Dget_space");
tmp_space_compact = (H5S_t *)H5I_object(tmp_sid_compact);
CHECK(tmp_space_compact, NULL, "H5I_object");
CHECK_PTR(tmp_space_compact, "H5I_object");

/* Create the contiguous dataset */
did_contig =
Expand All @@ -6675,7 +6675,7 @@ test_libver_bounds_dataspace(hid_t fapl)
tmp_sid_contig = H5Dget_space(did_contig);
CHECK(tmp_sid_contig, H5I_INVALID_HID, "H5Dget_space");
tmp_space_contig = (H5S_t *)H5I_object(tmp_sid_contig);
CHECK(tmp_space_contig, NULL, "H5I_object");
CHECK_PTR(tmp_space_contig, "H5I_object");

/* Verify versions for the three dataspaces */
VERIFY(tmp_space->extent.version, H5O_sdspace_ver_bounds[f->shared->low_bound],
Expand Down Expand Up @@ -6899,7 +6899,7 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid)

/* Get the internal datatype pointer */
dtype = (H5T_t *)H5I_object(dtid);
CHECK(dtype, NULL, "H5I_object");
CHECK_PTR(dtype, "H5I_object");

/* Verify the datatype message version */
/* H5T_COMPOUND, H5T_ENUM, H5T_ARRAY:
Expand Down Expand Up @@ -6973,13 +6973,13 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid)

/* Get the internal file pointer */
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");

/* Open the committed datatype */
str_tid = H5Topen2(fid, "datatype", H5P_DEFAULT);
CHECK(str_tid, FAIL, "H5Topen2");
str_dtype = (H5T_t *)H5VL_object(str_tid);
CHECK(str_dtype, NULL, "H5VL_object");
CHECK_PTR(str_dtype, "H5VL_object");

/* Verify the committed datatype message version */
VERIFY(str_dtype->shared->version, H5O_dtype_ver_bounds[H5F_LIBVER_EARLIEST],
Expand All @@ -6999,7 +6999,7 @@ test_libver_bounds_datatype_check(hid_t fapl, hid_t tid)

/* Get the internal datatype pointer */
dtype = (H5T_t *)H5I_object(dtid);
CHECK(dtype, NULL, "H5I_object");
CHECK_PTR(dtype, "H5I_object");

/* Verify the dataset's datatype message version */
/* H5T_COMPOUND, H5T_ENUM, H5T_ARRAY:
Expand Down Expand Up @@ -7132,7 +7132,7 @@ test_libver_bounds_attributes(hid_t fapl)

/* Get the internal attribute pointer */
attr = (H5A_t *)H5VL_object(aid);
CHECK(attr, NULL, "H5VL_object");
CHECK_PTR(attr, "H5VL_object");

/* Verify the attribute version */
if (low == H5F_LIBVER_EARLIEST)
Expand All @@ -7151,7 +7151,7 @@ test_libver_bounds_attributes(hid_t fapl)

/* Get the internal attribute pointer */
attr = (H5A_t *)H5VL_object(aid);
CHECK(attr, NULL, "H5VL_object");
CHECK_PTR(attr, "H5VL_object");

/* Verify attribute version */
VERIFY(attr->shared->version, H5O_attr_ver_bounds[low], "H5O_attr_ver_bounds");
Expand All @@ -7172,7 +7172,7 @@ test_libver_bounds_attributes(hid_t fapl)

/* Get internal attribute pointer */
attr = (H5A_t *)H5VL_object(aid);
CHECK(attr, NULL, "H5VL_object");
CHECK_PTR(attr, "H5VL_object");

/* Verify attribute version */
if (low == H5F_LIBVER_EARLIEST)
Expand Down Expand Up @@ -7237,7 +7237,7 @@ test_libver_bounds_attributes(hid_t fapl)

/* Get the internal attribute pointer */
attr = (H5A_t *)H5VL_object(aid);
CHECK(attr, NULL, "H5VL_object");
CHECK_PTR(attr, "H5VL_object");

/* Verify the attribute version */
if (low == H5F_LIBVER_EARLIEST)
Expand Down Expand Up @@ -7299,7 +7299,7 @@ test_libver_bounds_attributes(hid_t fapl)

/* Get the internal file pointer */
f = (H5F_t *)H5VL_object(fid);
CHECK(f, NULL, "H5VL_object");
CHECK_PTR(f, "H5VL_object");

/* Open the group */
gid = H5Gopen2(fid, GRP_NAME, H5P_DEFAULT);
Expand All @@ -7311,7 +7311,7 @@ test_libver_bounds_attributes(hid_t fapl)

/* Get the internal attribute pointer */
attr = (H5A_t *)H5VL_object(aid);
CHECK(attr, NULL, "H5VL_object");
CHECK_PTR(attr, "H5VL_object");

/* Verify the attribute message version */
VERIFY(attr->shared->version, H5O_attr_ver_bounds[f->shared->low_bound],
Expand Down
Loading