[svn-r22013] HDFFV-7560:

Merge 1.8 and h5dump/tools and tests based on tools library from trunk.
Reduced warnings.

HDFFV-7949:
Remove duplicated functions in h5ls

Tested: local linux,h5committest

1 files changed, 28 insertions, 21 deletions

diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index cac2654..95b90d4 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -17,6 +17,7 @@
 #include "h5test.h"
 #include "h5diff.h"
 #include "h5tools.h"
+#include "h5tools_utils.h"
 
 #define GOERROR  {H5_FAILED(); goto error;}
 
@@ -169,9 +170,15 @@ int main (void)
     int szip_can_encode = 0;
 #endif
 
+    h5tools_setprogname(PROGRAMNAME);
+    h5tools_setstatus(EXIT_SUCCESS);
+
+    /* Initialize h5tools lib */
+    h5tools_init();
+
     /* initialize */
-    memset(&diff_options, 0, sizeof (diff_opt_t));
-    memset(&pack_options, 0, sizeof (pack_opt_t));
+    HDmemset(&diff_options, 0, sizeof (diff_opt_t));
+    HDmemset(&pack_options, 0, sizeof (pack_opt_t));
 
     /* run tests  */
     puts("Testing h5repack:");
@@ -3105,7 +3112,7 @@ int make_big(hid_t loc_id)
     if (H5Dwrite (did,H5T_NATIVE_SCHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0)
         goto out;
 
-    free(buf);
+    HDfree(buf);
     buf=NULL;
 
     /* close */
@@ -3230,7 +3237,7 @@ make_userblock(void)
 
     /* Write userblock data */
     nwritten = HDwrite(fd, ub, (size_t)USERBLOCK_SIZE);
-    assert(nwritten == USERBLOCK_SIZE);
+    HDassert(nwritten == USERBLOCK_SIZE);
 
     /* Close file */
     HDclose(fd);
@@ -3294,7 +3301,7 @@ verify_userblock( const char* filename)
 
     /* Read userblock data */
     nread = HDread(fd, ub, (size_t)USERBLOCK_SIZE);
-    assert(nread == USERBLOCK_SIZE);
+    HDassert(nread == USERBLOCK_SIZE);
 
     /* Verify userblock data */
     for(u = 0; u < USERBLOCK_SIZE; u++)
@@ -3343,7 +3350,7 @@ make_userblock_file(void)
 
     /* write userblock data */
     nwritten = HDwrite(fd, ub, (size_t)USERBLOCK_SIZE);
-    assert(nwritten == USERBLOCK_SIZE);
+    HDassert(nwritten == USERBLOCK_SIZE);
 
     /* close file */
     HDclose(fd);
@@ -3668,7 +3675,7 @@ int write_dset_in(hid_t loc_id,
         H5Dclose(did);
         H5Tclose(tid);
         H5Sclose(sid);
-        free( dbuf );
+        HDfree( dbuf );
     }
 
     /*-------------------------------------------------------------------------
@@ -3703,7 +3710,7 @@ int write_dset_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf12, 'z', sizeof buf12);
+        HDmemset(buf12, 'z', sizeof buf12);
     }
 
 
@@ -3724,7 +3731,7 @@ int write_dset_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf22,0,sizeof buf22);
+        HDmemset(buf22,0,sizeof buf22);
     }
 
     if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
@@ -3754,7 +3761,7 @@ int write_dset_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf32,0,sizeof buf32);
+        HDmemset(buf32,0,sizeof buf32);
     }
 
     if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
@@ -3846,7 +3853,7 @@ int write_dset_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf62,0,sizeof buf62);
+        HDmemset(buf62,0,sizeof buf62);
     }
 
 
@@ -3864,8 +3871,8 @@ int write_dset_in(hid_t loc_id,
 
 
     if(make_diffs) {
-        memset(buf72, 0, sizeof buf72);
-        memset(buf82, 0, sizeof buf82);
+        HDmemset(buf72, 0, sizeof buf72);
+        HDmemset(buf82, 0, sizeof buf82);
     }
 
 
@@ -3905,7 +3912,7 @@ int write_dset_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf13,'z',sizeof buf13);
+        HDmemset(buf13,'z',sizeof buf13);
     }
 
     if ((tid = H5Tcopy(H5T_C_S1)) < 0)
@@ -4218,9 +4225,9 @@ int make_dset_reg_ref(hid_t loc_id)
 
 out:
     if(wbuf)
-        free(wbuf);
+        HDfree(wbuf);
     if(dwbuf)
-        free(dwbuf);
+        HDfree(dwbuf);
 
     H5E_BEGIN_TRY
     {
@@ -4625,7 +4632,7 @@ int write_attr_in(hid_t loc_id,
     */
     if (make_diffs)
     {
-        memset(buf12, 'z', sizeof buf12);
+        HDmemset(buf12, 'z', sizeof buf12);
     }
 
     /*
@@ -4665,7 +4672,7 @@ int write_attr_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf22,0,sizeof buf22);
+        HDmemset(buf22,0,sizeof buf22);
     }
 
     /*
@@ -4725,7 +4732,7 @@ int write_attr_in(hid_t loc_id,
     */
     if (make_diffs)
     {
-        memset(buf32,0,sizeof buf32);
+        HDmemset(buf32,0,sizeof buf32);
     }
 
     /*
@@ -4873,7 +4880,7 @@ int write_attr_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf62,0,sizeof buf62);
+        HDmemset(buf62,0,sizeof buf62);
     }
     /*
     buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
@@ -4959,7 +4966,7 @@ int write_attr_in(hid_t loc_id,
 
     if (make_diffs)
     {
-        memset(buf13,'z',sizeof buf13);
+        HDmemset(buf13,'z',sizeof buf13);
     }
 
     /*