[svn-r30113] Description:

    Clean up warnings (from 2774 -> 1560, with my standard debug build)

Tested on:
    MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
    (h5committest forthcoming)

1 files changed, 76 insertions, 74 deletions

diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index 09751ab..182d570 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -26,12 +26,12 @@
 
 typedef struct {
     hid_t fid;                      /* File ID being traversed */
-    char *op_name;                    /* Object name wanted */
+    const char *op_name;            /* Object name wanted */
 } trav_handle_udata_t;
 
 typedef struct {
-    char *path;                     /* Path of object being searched */
-    char *op_name;                    /* Object name wanted */
+    const char *path;                 /* Path of object being searched */
+    const char *op_name;              /* Object name wanted */
 } trav_attr_udata_t;
 
 /* callback function used by H5Literate() */
@@ -59,7 +59,7 @@ dump_datatype(hid_t type)
     h5tool_format_t  *outputformat = &h5tools_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     h5dump_type_table = type_table;
@@ -88,7 +88,7 @@ dump_dataspace(hid_t space)
     h5tool_format_t  *outputformat = &h5tools_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     h5tools_dump_dataspace(rawoutstream, outputformat, &ctx, space);
@@ -122,7 +122,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
     herr_t      ret = SUCCEED;
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     attr_id = H5Aopen(oid, attr_name, H5P_DEFAULT);
@@ -137,7 +137,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
         string_dataformat.fmt_float = fp_format;
     }
 
-    if (h5tools_nCols==0) {
+    if (h5tools_nCols == 0) {
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
@@ -198,7 +198,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     string_dataformat = *outputformat;
@@ -208,7 +208,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
         string_dataformat.fmt_float = fp_format;
     }
 
-    if (h5tools_nCols==0) {
+    if (h5tools_nCols == 0) {
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
@@ -379,8 +379,8 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                 H5Dclose(obj);
             }
             else {
-                if (dapl_id)
-                    H5Pclose(dapl_id && dapl_id != H5P_DEFAULT);
+                if (dapl_id != H5P_DEFAULT)
+                    H5Pclose(dapl_id);
                 error_msg("unable to dump dataset \"%s\"\n", name);
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
@@ -670,7 +670,7 @@ dump_named_datatype(hid_t tid, const char *name)
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     string_dataformat = *outputformat;
@@ -680,7 +680,7 @@ dump_named_datatype(hid_t tid, const char *name)
         string_dataformat.fmt_float = fp_format;
     }
 
-    if (h5tools_nCols==0) {
+    if (h5tools_nCols == 0) {
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
@@ -833,7 +833,7 @@ dump_group(hid_t gid, const char *name)
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     string_dataformat = *outputformat;
@@ -843,7 +843,7 @@ dump_group(hid_t gid, const char *name)
         string_dataformat.fmt_float = fp_format;
     }
 
-    if (h5tools_nCols==0) {
+    if (h5tools_nCols == 0) {
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
@@ -880,9 +880,8 @@ dump_group(hid_t gid, const char *name)
             }
     } /* end if */
 
-    if(display_oid) {
+    if(display_oid)
         h5tools_dump_oid(rawoutstream, outputformat, &ctx, gid);
-    }
 
     h5tools_dump_comment(rawoutstream, outputformat, &ctx, gid);
 
@@ -968,7 +967,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     hsize_t       curr_pos = 0;        /* total data element position   */
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     string_dataformat = *outputformat;
@@ -978,7 +977,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
         string_dataformat.fmt_float = fp_format;
     }
 
-    if (h5tools_nCols==0) {
+    if (h5tools_nCols == 0) {
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
@@ -1038,20 +1037,20 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     H5Pclose(dcpl_id);
 
     if(display_data) {
-        int  data_loop = 1;
-        int  i;
+        unsigned  data_loop = 1;
+        unsigned  u;
 
         if(display_packed_bits)
             data_loop = packed_bits_num;
-        for(i=0; i<data_loop; i++) {
+        for(u = 0; u < data_loop; u++) {
             if(display_packed_bits) {
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
                 /* Render the element */
                 h5tools_str_reset(&buffer);
-                packed_data_mask = packed_mask[i];
-                packed_data_offset = packed_offset[i];
-                packed_data_length = packed_length[i];
+                packed_data_mask = packed_mask[u];
+                packed_data_offset = packed_offset[u];
+                packed_data_length = packed_length[u];
                 h5tools_print_packed_bits(&buffer, type);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
             }
@@ -1090,7 +1089,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
                 HDassert(0);
                 break;
             } /* end switch */
-        } /* for(i=0;i<data_loop;i++) */
+        } /* for(u=0; u<data_loop; u++) */
     }
     H5Tclose(type);
 
@@ -1147,7 +1146,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
         string_dataformat.fmt_float = fp_format;
     }
 
-    if (h5tools_nCols==0) {
+    if (h5tools_nCols == 0) {
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
@@ -1158,7 +1157,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
     outputformat = &string_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     if(obj_data == DATASET_DATA)
@@ -1331,19 +1330,17 @@ static herr_t
 attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_data)
 {
     herr_t              ret = SUCCEED;
-    int                 i;
     int                 j;
-    int                 k;
     char               *obj_op_name;
     char               *obj_name;
     trav_attr_udata_t  *attr_data = (trav_attr_udata_t*)_op_data;
-    char               *buf = attr_data->path;
-    char               *op_name = attr_data->op_name;
+    const char         *buf = attr_data->path;
+    const char         *op_name = attr_data->op_name;
 
     j = (int)HDstrlen(op_name) - 1;
     /* find the last / */
     while(j >= 0) {
-        if (op_name[j] == '/' && (j==0 || (j>0 && op_name[j-1]!='\\')))
+        if(op_name[j] == '/' && (j == 0 || (j > 0 && op_name[j - 1] != '\\')))
             break;
         j--;
     }
@@ -1356,23 +1353,25 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a
     }
     else {
         if(HDstrcmp(attr_name, obj_op_name)==0) {
+            size_t u, v, w;
+
             /* object name */
-            i = (int)HDstrlen(buf);
-            j = (int)HDstrlen(op_name);
-            k = (size_t)i + 1 + (size_t)j + 1 + 2;
-            obj_name = (char *)HDmalloc((size_t)k);
+            u = HDstrlen(buf);
+            v = HDstrlen(op_name);
+            w = u + 1 + v + 1 + 2;
+            obj_name = (char *)HDmalloc(w);
             if(obj_name == NULL) {
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
             }
             else {
-                HDmemset(obj_name, '\0', (size_t)k);
+                HDmemset(obj_name, '\0', w);
                 if(op_name[0] != '/') {
-                    HDstrncat(obj_name, buf, (size_t)i + 1);
-                    if(buf[i-1] != '/')
+                    HDstrncat(obj_name, buf, u + 1);
+                    if(buf[u - 1] != '/')
                         HDstrncat(obj_name, "/", (size_t)2);
                 }
-                HDstrncat(obj_name, op_name, (size_t)j + 1);
+                HDstrncat(obj_name, op_name, v + 1);
 
                 handle_attributes(oid, obj_name, NULL, 0, NULL);
                 HDfree(obj_name);
@@ -1387,29 +1386,32 @@ static herr_t
 obj_search(const char *path, const H5O_info_t *oi, const char H5_ATTR_UNUSED *already_visited, void *_op_data)
 {
     trav_handle_udata_t  *handle_data = (trav_handle_udata_t*)_op_data;
-    char *op_name = (char*)handle_data->op_name;
-
+    const char *op_name = handle_data->op_name;
     trav_attr_udata_t  attr_data;
-    attr_data.path = (char*)path;
+
+    attr_data.path = path;
     attr_data.op_name = op_name;
     H5Aiterate_by_name(handle_data->fid, path, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_search, (void*)&attr_data, H5P_DEFAULT);
 
-    if(HDstrcmp(path, op_name)==0) {
+    if(HDstrcmp(path, op_name) == 0) {
         switch(oi->type) {
-        case H5O_TYPE_GROUP:
-            handle_groups(handle_data->fid, path, NULL, 0, NULL);
-            break;
-        case H5O_TYPE_DATASET:
-            handle_datasets(handle_data->fid, path, NULL, 0, NULL);
-            break;
-        case H5O_TYPE_NAMED_DATATYPE:
-            handle_datatypes(handle_data->fid, path, NULL, 0, NULL);
-            break;
-        case H5O_TYPE_UNKNOWN:
-        case H5O_TYPE_NTYPES:
-        default:
-            error_msg("unknown object type value\n");
-            h5tools_setstatus(EXIT_FAILURE);
+            case H5O_TYPE_GROUP:
+                handle_groups(handle_data->fid, path, NULL, 0, NULL);
+                break;
+
+            case H5O_TYPE_DATASET:
+                handle_datasets(handle_data->fid, path, NULL, 0, NULL);
+                break;
+
+            case H5O_TYPE_NAMED_DATATYPE:
+                handle_datatypes(handle_data->fid, path, NULL, 0, NULL);
+                break;
+
+            case H5O_TYPE_UNKNOWN:
+            case H5O_TYPE_NTYPES:
+            default:
+                error_msg("unknown object type value\n");
+                h5tools_setstatus(EXIT_FAILURE);
         } /* end switch */
     }
 
@@ -1419,19 +1421,18 @@ obj_search(const char *path, const H5O_info_t *oi, const char H5_ATTR_UNUSED *al
 static herr_t
 lnk_search(const char *path, const H5L_info_t *li, void *_op_data)
 {
-    int         search_len;
-    int            k;
+    size_t      search_len;
+    size_t      k;
     char       *search_name;
     trav_handle_udata_t  *handle_data = (trav_handle_udata_t*)_op_data;
-    char *op_name = (char*)handle_data->op_name;
+    const char *op_name = handle_data->op_name;
 
     search_len = HDstrlen(op_name);
-    if(search_len > 0 && op_name[0] != '/') {
+    if(search_len > 0 && op_name[0] != '/')
         k = 2;
-    }
     else
         k = 1;
-    search_name = (char *)HDmalloc((size_t)(search_len + k));
+    search_name = (char *)HDmalloc(search_len + k);
     if(search_name == NULL) {
         error_msg("creating temporary link\n");
         h5tools_setstatus(EXIT_FAILURE);
@@ -1439,10 +1440,10 @@ lnk_search(const char *path, const H5L_info_t *li, void *_op_data)
     else {
         if (k == 2) {
             HDstrcpy(search_name, "/");
-            HDstrncat(search_name, op_name, (size_t)search_len + 1);
+            HDstrncat(search_name, op_name, search_len + 1);
         }
         else
-            HDstrncpy(search_name, op_name, (size_t)search_len + 1);
+            HDstrncpy(search_name, op_name, search_len + 1);
         search_name[search_len + k - 1] = '\0';
 
         if(HDstrcmp(path, search_name) == 0) {
@@ -1513,7 +1514,7 @@ handle_paths(hid_t fid, const char *path_name, void H5_ATTR_UNUSED * data, int H
         }
 
         handle_udata.fid = fid;
-        handle_udata.op_name = (char*)path_name;
+        handle_udata.op_name = path_name;
         if(h5trav_visit(fid, "/", TRUE, TRUE, obj_search, lnk_search, &handle_udata) < 0) {
             error_msg("error traversing information\n");
             h5tools_setstatus(EXIT_FAILURE);
@@ -1574,7 +1575,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
 
     dump_indent += COL;
     HDmemset(&ctx, 0, sizeof(ctx));
-    ctx.indent_level = dump_indent/COL;
+    ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
 
     string_dataformat = *outputformat;
@@ -1584,7 +1585,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
         string_dataformat.fmt_float = fp_format;
     }
 
-    if (h5tools_nCols==0) {
+    if (h5tools_nCols == 0) {
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
@@ -1713,9 +1714,8 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
         }
     }
     if((dsetid = H5Dopen2(fid, dset, dapl_id)) < 0) {
-        if (pe) {
+        if (pe)
             handle_links(fid, dset, data, pe, display_name);
-        }
         return;
     } /* end if */
 
@@ -1731,8 +1731,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
             h5tools_setstatus(EXIT_FAILURE);
             return;
         }
-        else
-            ndims = ndims_res;
+        ndims = (unsigned)ndims_res;
 
         if(!sset->start.data || !sset->stride.data || !sset->count.data || !sset->block.data) {
             /* they didn't specify a ``stride'' or ``block''. default to 1 in all
@@ -2142,12 +2141,15 @@ dump_extlink(hid_t group, const char *linkname, const char *objname)
             case H5O_TYPE_GROUP:
                 handle_groups(group, linkname, NULL, 0, objname);
                 break;
+
             case H5O_TYPE_DATASET:
                 handle_datasets(group, linkname, NULL, 0, objname);
                 break;
+
             case H5O_TYPE_NAMED_DATATYPE:
                 handle_datatypes(group, linkname, NULL, 0, objname);
                 break;
+
             case H5O_TYPE_UNKNOWN:
             case H5O_TYPE_NTYPES:
             default: