HDFFV-9994 port changes from develop.

CMake folder changes brought up to standard.

1 files changed, 27 insertions, 27 deletions

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