mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-12-09 07:32:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2737 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop

Browse Source 
* commit '65e92e1d56dd2e04ebe7b7713fee9e9e38cd8849':
  Warning fixes in tools and h5test.c
This commit is contained in:
Dana Robinson 2020-08-05 21:35:41 -05:00
commit 482ade4657
3 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/h5test.c
View File

@ -2097,8 +2097,14 @@ h5_compare_file_bytes(char *f1name, char *f2name)
HDrewind(f1ptr);
HDrewind(f2ptr);
for (ii = 0; ii < f1size; ii++) {
HDfread(&f1char, 1, 1, f1ptr);
HDfread(&f2char, 1, 1, f2ptr);
if(HDfread(&f1char, 1, 1, f1ptr) != 1) {
ret_value = -1;
goto done;
}
if(HDfread(&f2char, 1, 1, f2ptr) != 1) {
ret_value = -1;
goto done;
}
if (f1char != f2char) {
HDfprintf(stderr, "Mismatch @ 0x%llX: 0x%X != 0x%X\n", ii, f1char, f2char);
ret_value = -1;
@ -2107,13 +2113,11 @@ h5_compare_file_bytes(char *f1name, char *f2name)
}
done:
if (f1ptr) {
if (f1ptr)
HDfclose(f1ptr);
}
if (f2ptr) {
if (f2ptr)
HDfclose(f2ptr);
}
return(ret_value);
return ret_value;
} /* end h5_compare_file_bytes() */
/*-------------------------------------------------------------------------
@ -2220,7 +2224,10 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest)
}
while (read_size > 0) {
HDfread(dup_buf, read_size, 1, orig_ptr); /* warning: no error-check */
if(HDfread(dup_buf, read_size, 1, orig_ptr) != 1) {
ret_value = -1;
goto done;
}
HDfwrite(dup_buf, read_size, 1, dest_ptr);
fsize -= read_size;
read_size = MIN(fsize, max_buf);

49
tools/lib/h5diff_attr.c
View File

@ -333,7 +333,7 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id,
hsize_t dims1[H5S_MAX_RANK]; /* dimensions of dataset */
hsize_t dims2[H5S_MAX_RANK]; /* dimensions of dataset */
hsize_t nfound = 0;
int j;
size_t sz;
diff_err_t ret_value = opts->err_stat;
H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat);
@ -384,19 +384,19 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id,
H5TOOLS_DEBUG("attr_names: %s - %s", name1, name2);
if (name1) {
j = (int)HDstrlen(name1);
H5TOOLS_DEBUG("attr1_name: %s - %d", name1, j);
if (j > 0) {
opts->obj_name[0] = (char *)HDmalloc((size_t)j + 1);
HDstrncpy(opts->obj_name[0], name1, (size_t)j + 1);
sz = HDstrlen(name1);
H5TOOLS_DEBUG("attr1_name: %s - %d", name1, sz);
if (sz > 0) {
opts->obj_name[0] = (char *)HDmalloc(sz + 1);
HDstrncpy(opts->obj_name[0], name1, sz + 1);
}
}
if (name2) {
j = (int)HDstrlen(name2);
H5TOOLS_DEBUG("attr2_name: %s - %d", name2, j);
if (j > 0) {
opts->obj_name[1] = (char *)HDmalloc((size_t)j + 1);
HDstrncpy(opts->obj_name[1], name2, (size_t)j + 1);
sz = HDstrlen(name2);
H5TOOLS_DEBUG("attr2_name: %s - %d", name2, sz);
if (sz > 0) {
opts->obj_name[1] = (char *)HDmalloc(sz + 1);
HDstrncpy(opts->obj_name[1], name2, sz + 1);
}
}
H5TOOLS_DEBUG("attr_names: %s - %s", opts->obj_name[0], opts->obj_name[1]);
@ -404,6 +404,9 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id,
/* pass dims1 and dims2 for maxdims as well since attribute's maxdims
* are always same */
if(diff_can_type(ftype1_id, ftype2_id, rank1, rank2, dims1, dims2, dims1, dims2, opts, 0) == 1) {
int j;
/*-----------------------------------------------------------------
* "upgrade" the smaller memory size
*------------------------------------------------------------------
@ -461,22 +464,18 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id,
H5TOOLS_DEBUG("attr_names: %s - %s : %s - %s", name1, name2, path1, path2);
if (name1) {
j = (int)HDstrlen(name1) + (int)HDstrlen(path1) + 7;
H5TOOLS_DEBUG("attr1_name: %s - %d", name1, j);
if (j > 0) {
opts->obj_name[0] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
HDsnprintf(opts->obj_name[0], j, "%s of <%s>", name1, path1);
opts->obj_name[0][j] = '\0';
}
sz = HDstrlen(name1) + HDstrlen(path1) + 7;
H5TOOLS_DEBUG("attr1_name: %s - %d", name1, sz);
opts->obj_name[0] = (char *)HDcalloc(sz + 1, sizeof(char));
HDsnprintf(opts->obj_name[0], sz, "%s of <%s>", name1, path1);
opts->obj_name[0][sz] = '\0';
}
if (name2) {
j = (int)HDstrlen(name2) + (int)HDstrlen(path2) + 7;
H5TOOLS_DEBUG("attr2_name: %s - %d", name2, j);
if (j > 0) {
opts->obj_name[1] = (char *)HDcalloc((size_t)j + 1, sizeof(char));
HDsnprintf(opts->obj_name[1], j, "%s of <%s>", name2, path2);
opts->obj_name[1][j] = '\0';
}
sz = HDstrlen(name2) + HDstrlen(path2) + 7;
H5TOOLS_DEBUG("attr2_name: %s - %d", name2, sz);
opts->obj_name[1] = (char *)HDcalloc(sz + 1, sizeof(char));
HDsnprintf(opts->obj_name[1], sz, "%s of <%s>", name2, path2);
opts->obj_name[1][sz] = '\0';
}
/*---------------------------------------------------------------------

5
tools/src/h5diff/h5diff_common.c
View File

@ -90,6 +90,7 @@ static void check_options(diff_opt_t* opts)
* Return: <none>
*-------------------------------------------------------------------------
*/
#if 0
static void
parse_hsize_list(const char *h_list, subset_d *d)
{
@ -139,6 +140,7 @@ parse_hsize_list(const char *h_list, subset_d *d)
d->len = size_count;
H5TOOLS_ENDDEBUG("");
}
#endif
/*-------------------------------------------------------------------------
* Function: parse_subset_params
@ -149,6 +151,7 @@ parse_hsize_list(const char *h_list, subset_d *d)
* Failure: NULL
*-------------------------------------------------------------------------
*/
#if 0
static struct subset_t *
parse_subset_params(const char *dset)
{
@ -190,7 +193,7 @@ parse_subset_params(const char *dset)
return s;
}
#endif
/*-------------------------------------------------------------------------
* Function: parse_command_line