HDFFV-9994 port changes from develop.

CMake folder changes brought up to standard.

4 files changed, 36 insertions, 36 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 2eb66f9..d7f5cb5 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -479,7 +479,7 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
                 tinfo->symlink_visited.dangle_link = TRUE;
                 trav_info_visit_lnk(path, linfo, tinfo);
                 if (opts->no_dangle_links)
-                    opts->err_stat = 1; /* make dgangling link is error */
+                    opts->err_stat = 1; /* make dangling link is error */
                 goto done;
             }
 
@@ -511,7 +511,7 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo,
                 tinfo->symlink_visited.dangle_link = TRUE;
                 trav_info_visit_lnk(path, linfo, tinfo);
                 if (opts->no_dangle_links)
-                    opts->err_stat = 1; /* make dgangling link is error */
+                    opts->err_stat = 1; /* make dangling link is error */
                 goto done;
             }
 
@@ -592,8 +592,8 @@ hsize_t h5diff(const char *fname1,
     trav_info_t  *info1_grp = NULL;
     trav_info_t  *info2_grp = NULL;
     /* local pointer */
-    trav_info_t  *info1_lp;
-    trav_info_t  *info2_lp;
+    trav_info_t  *info1_lp = NULL;
+    trav_info_t  *info2_lp = NULL;
     /* link info from specified object */
     H5L_info_t src_linfo1;
     H5L_info_t src_linfo2;
@@ -1555,7 +1555,7 @@ hsize_t diff(hid_t file1_id,
         {
             if (options->no_dangle_links)
             {
-                /* gangling link is error */
+                /* dangling link is error */
                 if(options->m_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", path1);
                 goto out;
@@ -1573,7 +1573,7 @@ hsize_t diff(hid_t file1_id,
         {
             if (options->no_dangle_links)
             {
-                /* gangling link is error */
+                /* dangling link is error */
                 if(options->m_verbose)
                     parallel_print("Warning: <%s> is a dangling link.\n", path2);
                 goto out;
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 157978d..17eeafe 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -71,9 +71,7 @@ hsize_t diff_dataset( hid_t file1_id,
     if((dcpl1 = H5Dget_create_plist(did1)) < 0)
         goto error;
     if((dcpl2 = H5Dget_create_plist(did2)) < 0)
-    {
         goto error;
-    }
 
     /*-------------------------------------------------------------------------
     * check if the dataset creation property list has filters that
@@ -91,6 +89,9 @@ hsize_t diff_dataset( hid_t file1_id,
             obj2_name,
             options);
     }
+    else
+        goto error;
+
     /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
@@ -324,7 +325,7 @@ hsize_t diff_datasetid( hid_t did1,
                 parallel_print("Not comparable: <%s> has sign %s ", obj1_name, get_sign(sign1));
                 parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
             }
-    
+
             can_compare=0;
             options->not_cmp=1;
         }
@@ -676,31 +677,30 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
     HDassert(tclass1==tclass2);
     switch (tclass1)
     {
-    case H5T_INTEGER:
-    case H5T_FLOAT:
-    case H5T_COMPOUND:
-    case H5T_STRING:
-    case H5T_ARRAY:
-    case H5T_BITFIELD:
-    case H5T_OPAQUE:
-    case H5T_ENUM:
-    case H5T_VLEN:
-    case H5T_REFERENCE:
-
-        break;
-
-    default: /*H5T_TIME */
-
+        case H5T_TIME:
+            if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name) {
+                parallel_print("Not comparable: <%s> and <%s> are of class %s\n",
+                    obj1_name,obj2_name,get_class(tclass2) );
+            } /* end if */
+            can_compare = 0;
+            options->not_cmp = 1;
+            return can_compare;
 
-        if ( (options->m_verbose||options->m_list_not_cmp) && obj1_name && obj2_name)
-        {
-            parallel_print("Not comparable: <%s> and <%s> are of class %s\n",
-                obj1_name,obj2_name,get_class(tclass2) );
-        }
-        can_compare = 0;
-        options->not_cmp = 1;
-        return can_compare;
-    }
+        case H5T_INTEGER:
+        case H5T_FLOAT:
+        case H5T_COMPOUND:
+        case H5T_STRING:
+        case H5T_ARRAY:
+        case H5T_BITFIELD:
+        case H5T_OPAQUE:
+        case H5T_ENUM:
+        case H5T_VLEN:
+        case H5T_REFERENCE:
+        case H5T_NO_CLASS:
+        case H5T_NCLASSES:
+        default:
+            break;
+    } /* end switch */
 
     /*-------------------------------------------------------------------------
     * check for equal file datatype; warning only
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 3928837..665c2e8 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -3156,7 +3156,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
                     break;
                 case H5Z_FILTER_SZIP:
-                    {
                         szip_options_mask = cd_values[0];;
                         szip_pixels_per_block = cd_values[1];
 
@@ -3219,7 +3218,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "%s", END);
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    }
                     break;
                 case H5Z_FILTER_NBIT:
                     h5tools_str_append(&buffer, "%s", NBIT);
@@ -3389,6 +3387,8 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
         case H5D_ALLOC_TIME_LATE:
             h5tools_str_append(&buffer, "%s", "H5D_ALLOC_TIME_LATE");
             break;
+            case H5D_ALLOC_TIME_ERROR:
+            case H5D_ALLOC_TIME_DEFAULT:
         default:
             HDassert(0);
             break;
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 7f65c91..e62c7b0 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -736,7 +736,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     long double templdouble;
 
                     HDmemcpy(&templdouble, vp, sizeof(long double));
-                    h5tools_str_append(str, "%Lf", templdouble);
+                    h5tools_str_append(str, OPT(info->fmt_double, "%Lf"), templdouble);
 #endif
                 }
                 break;