summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/h5dump/h5dump.c28
-rw-r--r--tools/h5dump/h5dumpgentest.c2
2 files changed, 10 insertions, 20 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 3cbef84..9df06da 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -2026,7 +2026,6 @@ static void dump_fill_value(hid_t dcpl,hid_t type_id, hid_t obj_id)
void *buf=NULL;
int nelmts=1;
h5dump_t *outputformat = &dataformat;
- herr_t ret;
hid_t n_type;
memset(&ctx, 0, sizeof(ctx));
@@ -2036,7 +2035,7 @@ static void dump_fill_value(hid_t dcpl,hid_t type_id, hid_t obj_id)
n_type = H5Tget_native_type(type_id,H5T_DIR_DEFAULT);
- ret=H5Pget_fill_value(dcpl, n_type, buf);
+ H5Pget_fill_value(dcpl, n_type, buf);
h5tools_dump_simple_data(stdout, outputformat, obj_id, &ctx,
START_OF_DATA | END_OF_DATA, nelmts, n_type, buf);
@@ -2393,17 +2392,16 @@ dump_fcpl(hid_t fid)
int freelist; /* free list version # */
int stab; /* symbol table entry version # */
int shhdr; /* shared object header version # */
- herr_t ret; /* generic return value */
hid_t driver; /* file driver */
char dname[15]; /* buffer to store driver name */
fcpl=H5Fget_create_plist(fid);
- ret=H5Pget_version(fcpl, &super, &freelist, &stab, &shhdr);
- ret=H5Pget_userblock(fcpl,&userblock);
- ret=H5Pget_sizes(fcpl,&off_size,&len_size);
- ret=H5Pget_sym_k(fcpl,&sym_ik,&sym_lk);
- ret=H5Pget_istore_k(fcpl,&istore_ik);
- ret=H5Pclose(fcpl);
+ H5Pget_version(fcpl, &super, &freelist, &stab, &shhdr);
+ H5Pget_userblock(fcpl,&userblock);
+ H5Pget_sizes(fcpl,&off_size,&len_size);
+ H5Pget_sym_k(fcpl,&sym_ik,&sym_lk);
+ H5Pget_istore_k(fcpl,&istore_ik);
+ H5Pclose(fcpl);
fapl = h5_fileaccess();
driver = H5Pget_driver(fapl);
H5Pclose(fapl);
@@ -2421,26 +2419,18 @@ dump_fcpl(hid_t fid)
indentation(indent + COL);
HDfprintf(stdout,"%s %Hu\n","USERBLOCK_VERSION", userblock);
indentation(indent + COL);
- printf("%s %d\n","OFFSET_SIZE", off_size);
+ HDfprintf(stdout,"%s %Hd\n","OFFSET_SIZE", (long_long)off_size);
indentation(indent + COL);
- printf("%s %d\n","LENGTH_SIZE", len_size);
+ HDfprintf(stdout,"%s %Hd\n","LENGTH_SIZE", (long_long)len_size);
indentation(indent + COL);
printf("%s %d\n","BTREE_RANK", sym_ik);
indentation(indent + COL);
printf("%s %d\n","BTREE_LEAF", sym_lk);
-
-
if (H5FD_CORE==driver)
{
strcpy(dname,"H5FD_CORE");
}
-#if 0
- else if (H5FD_DPSS==driver)
- {
- strcpy(dname,"H5FD_DPSS");
- }
-#endif
else if (H5FD_FAMILY==driver)
{
strcpy(dname,"H5FD_FAMILY");
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index d5c2728..9326558 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -4444,7 +4444,7 @@ make_external(hid_t fid)
*
*-------------------------------------------------------------------------
*/
-static void gent_filters()
+static void gent_filters(void)
{
hid_t fid; /* file id */
hid_t dcpl; /* dataset creation property list */