[svn-r25497] Description:

    Merge changes that correspond to the 64-bit ID changes (without the actual
switch to 64-bit IDs) to the 1.8 release branch.  (Plus a few minor cleanups
and alignments with the trunk that aren't on the branch)

Tested on:
    Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN
    (h5committested on branch already for a week)

4 files changed, 14 insertions, 15 deletions

diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c
index a60a560..2fc8140 100644
--- a/hl/test/gen_test_ds.c
+++ b/hl/test/gen_test_ds.c
@@ -255,13 +255,13 @@ herr_t test_cmp_scalename(hid_t fid, hid_t did, const char *name, const char *sc
     if((dsid = H5Dopen2(fid, name, H5P_DEFAULT)) >= 0) {
         if(H5DSis_attached(did, dsid, idx) == 1) {
             if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) > 0) {
-                name_out = (char*)malloc((size_t)name_len * sizeof (char));
+                name_out = (char*)HDmalloc((size_t)name_len * sizeof (char));
                 if(name_out != NULL) {
                     if(H5DSget_scale_name(dsid, name_out, (size_t)name_len) >= 0) {
                         if(strcmp(scalename,name_out)==0) {
                             ret_value = SUCCEED;
                         }
-                        free(name_out);
+                        HDfree(name_out);
                         name_out=NULL;
                     }
                 }
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index 9a0ffb0..bddd162 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -176,7 +176,7 @@ test_direct_chunk_write (hid_t file)
 	    direct_buf[i][j] = n++;
 
     /* Allocate output (compressed) buffer */
-    outbuf = malloc(z_dst_nbytes);
+    outbuf = HDmalloc(z_dst_nbytes);
     z_dst = (Bytef *)outbuf;
 
     /* Perform compression from the source to the destination buffer */
@@ -206,7 +206,7 @@ test_direct_chunk_write (hid_t file)
     }
 
     if(outbuf)
-        free(outbuf);
+        HDfree(outbuf);
 
     if(H5Fflush(dataset, H5F_SCOPE_LOCAL) < 0) 
         goto error;
@@ -249,7 +249,7 @@ test_direct_chunk_write (hid_t file)
 	    direct_buf[i][j] = i + j;
 
     /* Allocate output (compressed) buffer */
-    outbuf = malloc(z_dst_nbytes);
+    outbuf = HDmalloc(z_dst_nbytes);
     z_dst = (Bytef *)outbuf;
 
     /* Perform compression from the source to the destination buffer */
@@ -280,7 +280,7 @@ test_direct_chunk_write (hid_t file)
     }
 
     if(outbuf)
-        free(outbuf);
+        HDfree(outbuf);
 
     if(H5Fflush(dataset, H5F_SCOPE_LOCAL) < 0) 
         goto error;
@@ -329,7 +329,7 @@ error:
     } H5E_END_TRY;
 
     if(outbuf)
-        free(outbuf);
+        HDfree(outbuf);
 
     return 1;
 }
@@ -1016,13 +1016,13 @@ test_invalid_parameters(hid_t file)
 
     /* Check invalid dataset ID */ 
     H5E_BEGIN_TRY {
-        if((status = H5DOwrite_chunk(-1, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
+        if((status = H5DOwrite_chunk((hid_t)-1, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
             goto error;
     } H5E_END_TRY;
 
     /* Check invalid DXPL ID */
     H5E_BEGIN_TRY {
-        if((status = H5DOwrite_chunk(dataset, -1, filter_mask, offset, buf_size, direct_buf)) != FAIL)
+        if((status = H5DOwrite_chunk(dataset, (hid_t)-1, filter_mask, offset, buf_size, direct_buf)) != FAIL)
             goto error;
     } H5E_END_TRY;
 
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index 9729421..831fa23 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -77,23 +77,23 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
         FAIL_PUTS_ERROR("malloc() failed");
 
     /* allocate array of pointers for each of the open images */
-    if (NULL == (buf_ptr = (void **)malloc(sizeof(void *) * open_images)))
+    if (NULL == (buf_ptr = (void **)HDmalloc(sizeof(void *) * open_images)))
         FAIL_PUTS_ERROR("malloc() failed");
 
     /* allocate array to store the name of each of the open images */
-    if (NULL == (filename = (char **)malloc(sizeof(char *) * open_images)))
+    if (NULL == (filename = (char **)HDmalloc(sizeof(char *) * open_images)))
         FAIL_PUTS_ERROR("malloc() failed");
 
     /* allocate array to store the size of each of the open images */
-    if (NULL == (buf_size = (ssize_t *)malloc(sizeof(ssize_t) * open_images)))
+    if (NULL == (buf_size = (ssize_t *)HDmalloc(sizeof(ssize_t) * open_images)))
         FAIL_PUTS_ERROR("malloc() failed");
 
     /* allocate array for each of the file identifiers */
-    if (NULL == (file_id = (hid_t *)malloc(sizeof(hid_t) * open_images)))
+    if (NULL == (file_id = (hid_t *)HDmalloc(sizeof(hid_t) * open_images)))
         FAIL_PUTS_ERROR("malloc() failed");
 
     /* allocate array for each of the dataset identifiers */
-    if (NULL == (dset_id = (hid_t *)malloc(sizeof(hid_t) * open_images)))
+    if (NULL == (dset_id = (hid_t *)HDmalloc(sizeof(hid_t) * open_images)))
         FAIL_PUTS_ERROR("malloc() failed");
 
     TESTING("get file images");
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index a76f3d7..576d594 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -1820,7 +1820,6 @@ out:
 static int test_valid_path(void)
 {
   hid_t file_id, group;
-  FILE *fp = NULL;
   htri_t path_valid;
   const char *data_string_in = "test";