[svn-r23695] Description:

    Clean up warnings in H5Tconv.c (down to _only_ 9000 lines of output now!)

    Merge changes from Coverity branch back to trunk:

r20684:
Fix for coverity bug #1721 which was due to the fix for coverity bug #943.

r20685:
Use HDstrncpy. --gh

r20761:
Purpose: Fix valgrind issues

Description:
Free image_data and data as appropriate in test_image.

r20762:
Purpose: Fix coverity issue 600

Description:
Add check for return value of H5O_close in H5Ocopy.  Also cleaned up various
warnings.

r20763:
Purpose: Fix valgrind issues with h5stat

Description:
Modified h5stat to free "iter" before exit, and free "hand" before exit if
parse_command_line exits directly.

r20764:
fixed coverity issues:
69, 327, 614, 684, 685, 696, 697, 1681, 967, 826, 660, 80

r20765:
Fixed coverity bug 668

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program but I did add a check that n_elements is >= 1.

I also changed an error condition from doing its own close and returning -1 to "goto out;" like the rest of the program.

r20766:
Fixed coverity bug 667

Pulled x * y * z multiply out of malloc operand into a separate n_elements variable to quiet integer overflow warning.

No actual integer overflow tests are performed since it's just a test program.


Tested on:
    Mac OSX/64 10.8.3 (amazon) w/C++ & FORTRAN
    (h5committest upcoming)

2 files changed, 8 insertions, 23 deletions

diff --git a/test/H5srcdir.h b/test/H5srcdir.h
index 8bc8780..202d050 100644
--- a/test/H5srcdir.h
+++ b/test/H5srcdir.h
@@ -50,10 +50,12 @@ static const char *H5_get_srcdir_filename(const char *filename)
 #ifdef H5_VMS
         if(filename[0] == '[') {
             char *tmp = filename;
-            srcdir_testpath[strlen(srcdir)-1] = '\0';
-            strcat(srcdir_testpath, ++tmp);
-        } else
-            strcat(srcdir_testpath, filename);
+
+            srcdir_testpath[HDstrlen(srcdir) - 1] = '\0';
+            HDstrcat(srcdir_testpath, ++tmp);
+        } /* end if */
+        else
+            HDstrcat(srcdir_testpath, filename);
 #else
         HDstrcat(srcdir_testpath, "/");
         HDstrcat(srcdir_testpath, filename);
@@ -84,4 +86,3 @@ static const char *H5_get_srcdir(void)
 }
 #endif /* _H5SRCDIR_H */
 
-
diff --git a/test/h5test.c b/test/h5test.c
index 91497e3..32d78bd 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1124,24 +1124,8 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name)
 {
     int fd_old = (-1), fd_new = (-1);   /* File descriptors for copying data */
     ssize_t nread;                      /* Number of bytes read in */
-    char  buf[READ_BUF_SIZE];        /* Buffer for copying data */
-    char  filename[FILENAME_BUF_SIZE] = "";
-#ifdef H5_VMS 
-    HDstrcat(filename, origfilename);
-#else
-    const char * srcdir = HDgetenv("srcdir"); /* The source directory */
-
-    /* Check for using the srcdir from configure time */
-    if(NULL == srcdir)
-        srcdir = config_srcdir;
-
-    if(srcdir && ((HDstrlen(srcdir) +
-                   HDstrlen(origfilename) + 6) < FILENAME_BUF_SIZE)) {
-        HDstrcpy(filename, srcdir);
-        HDstrcat(filename, "/");
-    }
-    HDstrcat(filename, origfilename);
-#endif
+    char  buf[READ_BUF_SIZE];           /* Buffer for copying data */
+    const char *filename = H5_get_srcdir_filename(origfilename);;       /* Get the test file name to copy */
 
     /* Copy old file into temporary file */
     if((fd_old = HDopen(filename, O_RDONLY, 0666)) < 0) return -1;