[svn-r25198] Description:

    Bring r25197 from trunk to 1.8 branch:

    Bring changes from hdf5_1_8_coverity branch back to trunk:

r20878:
    Issue 76: Check if H5Tget_nmembers(type) fails and simply return(FALSE). Also move printf to after check.

r20880:
    Issue 192: Create ret_val var set to -1. Add out label for failures to jump to, return ret_val at bottom.

r20882:
    Fixes for coverity:
    1) bug #1679: remove dead code in test/mf.c
    2) bug #1680: remove dead code in tools/lib/h5diff_dset.c

r20883:
    Fix coverity issue 585

    Description:
    Changed variable "c" in processStrData in h5import.c to an int, to match fgetc
    return value, and removed call to feof, instead checking if c == EOF.

Tested on:
    MacOSX/64 10.9.3 (amazon) w/C++, FORTRAN & parallel
    (too minor to require h5committest)

1 files changed, 3 insertions, 6 deletions

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 257d4d1..d8768fb 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -820,8 +820,6 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Programmer: Robb Matzke
  *              Thursday, November  5, 1998
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -836,8 +834,7 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     if(H5T_COMPOUND != H5Tget_class(type))
         return FALSE;
-    nmembs = H5Tget_nmembers(type);
-    if(nmembs <= 0)
+    if((nmembs = H5Tget_nmembers(type)) < 0)
         return FALSE;
 
     h5tools_str_append(buffer, "struct {");
@@ -859,6 +856,7 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
     size = H5Tget_size(type);
     h5tools_str_append(buffer, "\n%*s} %lu byte%s",
                 ind, "", (unsigned long)size, 1==size?"":"s");
+
     return TRUE;
 }
 
@@ -887,8 +885,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     if(H5T_ENUM != H5Tget_class(type))
         return FALSE;
-    nmembs = H5Tget_nmembers(type);
-    if(nmembs < 0)
+    if((nmembs = H5Tget_nmembers(type)) < 0)
         return FALSE;
 
     super = H5Tget_super(type);