[svn-r27638] Merged r27500-27631 from trunk.

1 files changed, 35 insertions, 14 deletions

diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index aefd641..14fbcaa 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -78,8 +78,6 @@ void print_type(hid_t type)
 {
     switch (H5Tget_class(type))
     {
-    default:
-        return;
     case H5T_INTEGER:
         if (H5Tequal(type, H5T_STD_I8BE)) {
             parallel_print("H5T_STD_I8BE");
@@ -160,7 +158,21 @@ void print_type(hid_t type)
         }
         break;
 
-    }/*switch*/
+    case H5T_TIME:
+    case H5T_STRING:
+    case H5T_BITFIELD:
+    case H5T_OPAQUE:
+    case H5T_COMPOUND:
+    case H5T_REFERENCE:
+    case H5T_ENUM:
+    case H5T_VLEN:
+    case H5T_ARRAY:
+    case H5T_NO_CLASS:
+    case H5T_NCLASSES:
+    default:
+        return;
+
+    } /* end switch */
 }
 
 /*-------------------------------------------------------------------------
@@ -219,6 +231,7 @@ get_type(h5trav_type_t type)
             return("H5G_LINK");
         case H5TRAV_TYPE_UDLINK:
             return("H5G_UDLINK");
+        case H5TRAV_TYPE_UNKNOWN:
         default:
             return("unknown type");
     }
@@ -242,13 +255,18 @@ get_sign(H5T_sign_t sign)
 {
     switch (sign)
     {
-    default:
-        return("H5T_SGN_ERROR");
-    case H5T_SGN_NONE:
-        return("H5T_SGN_NONE");
-    case H5T_SGN_2:
-        return("H5T_SGN_2");
-    }
+        case H5T_SGN_NONE:
+            return "H5T_SGN_NONE";
+        case H5T_SGN_2:
+            return "H5T_SGN_2";
+        case H5T_SGN_ERROR:
+            return "H5T_SGN_ERROR";
+        case H5T_NSGN:
+            return "H5T_NSGN";
+        default:
+            HDassert(0);
+            return "unknown sign value";
+    } /* end switch */
 }
 
 
@@ -268,8 +286,6 @@ get_class(H5T_class_t tclass)
 {
     switch (tclass)
     {
-    default:
-        return("Invalid class");
     case H5T_TIME:
         return("H5T_TIME");
     case H5T_INTEGER:
@@ -292,8 +308,13 @@ get_class(H5T_class_t tclass)
         return("H5T_VLEN");
     case H5T_ARRAY:
         return("H5T_ARRAY");
-    }
-}
+    case H5T_NO_CLASS:
+    case H5T_NCLASSES:
+    default:
+        HDassert(0);
+        return("Invalid class");
+    } /* end switch */
+} /* end get_class() */
 
 /*-------------------------------------------------------------------------
  * Function: print_found