[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, 3 deletions

diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index aea2192..157978d 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -433,13 +433,13 @@ hsize_t diff_datasetid( hid_t did1,
                 HDassert(sm_nbytes > 0);
             } /* end for */
 
-      /* malloc return code should be verified.
+            /* malloc return code should be verified.
              * If fail, need to handle the error.
              * This else branch should be recoded as a separate function.
              * Note that there are many "goto error" within this branch
              * that fails to address freeing other objects created here.
-       * E.g., sm_space.
-       */
+             * E.g., sm_space.
+             */
             sm_buf1 = HDmalloc((size_t)sm_nbytes);
             HDassert(sm_buf1);
             sm_buf2 = HDmalloc((size_t)sm_nbytes);