summaryrefslogtreecommitdiffstats
path: root/tools/misc
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-08-31 19:04:23 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-08-31 19:04:23 (GMT)
commitc226e58005f54b29dc9fc5f762f7aa6382e790ff (patch)
treefa288e15e01237434f2193d99bc21bb50963b12f /tools/misc
parente6f9fc5f7f58e4c0a9a8541bc5674b440abd658c (diff)
downloadhdf5-c226e58005f54b29dc9fc5f762f7aa6382e790ff.zip
hdf5-c226e58005f54b29dc9fc5f762f7aa6382e790ff.tar.gz
hdf5-c226e58005f54b29dc9fc5f762f7aa6382e790ff.tar.bz2
[svn-r27626] Various minor warning fixes before major SWMR and VDS merges.
gcc 4.9.2 was used to create the warning list - implicit casts - shadowed variables - various enum issues - other minor fixes (comments, unused macros, etc.) Tested on: h5committest
Diffstat (limited to 'tools/misc')
-rw-r--r--tools/misc/h5debug.c12
-rw-r--r--tools/misc/h5mkgrp.c2
-rw-r--r--tools/misc/h5repart.c10
3 files changed, 14 insertions, 10 deletions
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index be6d089..3789723 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -121,8 +121,9 @@ get_H5B2_class(const uint8_t *sig)
cls = H5A_BT2_CORDER;
break;
+ case H5B2_NUM_BTREE_ID:
default:
- HDfprintf(stderr, "Unknown B-tree subtype %u\n", (unsigned)(subtype));
+ HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
HDexit(4);
} /* end switch */
@@ -156,8 +157,9 @@ get_H5EA_class(const uint8_t *sig)
cls = H5EA_CLS_TEST;
break;
+ case H5EA_NUM_CLS_ID:
default:
- HDfprintf(stderr, "Unknown array class %u\n", (unsigned)(clsid));
+ HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
HDexit(4);
} /* end switch */
@@ -191,8 +193,9 @@ get_H5FA_class(const uint8_t *sig)
cls = H5FA_CLS_TEST;
break;
+ case H5FA_NUM_CLS_ID:
default:
- HDfprintf(stderr, "Unknown array class %u\n", (unsigned)(clsid));
+ HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
HDexit(4);
} /* end switch */
@@ -382,8 +385,9 @@ main(int argc, char *argv[])
status = H5D_btree_debug(f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL, ndims, dim);
break;
+ case H5B_NUM_BTREE_ID:
default:
- HDfprintf(stderr, "Unknown B-tree subtype %u\n", (unsigned)(subtype));
+ HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
HDexit(4);
}
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index 8dee706..1c1bba1 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -181,7 +181,7 @@ parse_command_line(int argc, const char *argv[], param_t *parms)
/* Allocate space for the group name pointers */
parms->ngroups = (argc - opt_ind);
- parms->groups = HDmalloc(parms->ngroups * sizeof(char *));
+ parms->groups = (char **)HDmalloc(parms->ngroups * sizeof(char *));
/* Retrieve the group names */
curr_group = 0;
diff --git a/tools/misc/h5repart.c b/tools/misc/h5repart.c
index ffd52e8..f58af3a 100644
--- a/tools/misc/h5repart.c
+++ b/tools/misc/h5repart.c
@@ -261,13 +261,13 @@ main (int argc, char *argv[])
src_is_family = strcmp (src_name, src_gen_name);
if ((src=HDopen(src_name, O_RDONLY,0))<0) {
- perror (src_name);
- exit (EXIT_FAILURE);
+ perror (src_name);
+ exit (EXIT_FAILURE);
}
if (HDfstat(src, &sb)<0) {
- perror ("fstat");
- exit (EXIT_FAILURE);
+ perror ("fstat");
+ exit (EXIT_FAILURE);
}
src_size = src_act_size = sb.st_size;
if (verbose) fprintf (stderr, "< %s\n", src_name);
@@ -290,7 +290,7 @@ main (int argc, char *argv[])
if (argno<argc) usage (prog_name);
/* Now the real work, split the file */
- buf = HDmalloc (blk_size);
+ buf = (char *)HDmalloc(blk_size);
while (src_offset<src_size) {
/* Read a block. The amount to read is the minimum of: