[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

10 files changed, 139 insertions, 120 deletions

diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index a475a43..201c711 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -90,7 +90,7 @@ int h5repack_init (pack_opt_t *options,
                    int verbose)
 {
     int k, n;
-    memset(options,0,sizeof(pack_opt_t));
+    HDmemset(options,0,sizeof(pack_opt_t));
     options->min_comp = 1024;
     options->verbose  = verbose;
 
@@ -154,7 +154,7 @@ int h5repack_addfilter(const char* str,
         if(options->n_filter_g > H5_REPACK_MAX_NFILTERS)
         {
             error_msg("maximum number of filters exceeded for <%s>\n", str);
-            free(obj_list);
+            HDfree(obj_list);
             return -1;
         }
 
@@ -163,7 +163,7 @@ int h5repack_addfilter(const char* str,
     else
         options_add_filter(obj_list, n_objs, filter, options->op_tbl);
 
-    free(obj_list);
+    HDfree(obj_list);
     return 0;
 }
 
@@ -229,7 +229,7 @@ int h5repack_addlayout(const char* str,
         &pack,
         options->op_tbl);
 
-    free(obj_list);
+    HDfree(obj_list);
     return 0;
 }
 
@@ -627,20 +627,20 @@ static int check_options(pack_opt_t *options)
             switch (options->layout_g)
             {
             case H5D_COMPACT:
-                HDstrcpy(slayout,"compact");
+                strcpy(slayout,"compact");
                 break;
             case H5D_CONTIGUOUS:
-                HDstrcpy(slayout,"contiguous");
+                strcpy(slayout,"contiguous");
                 break;
             case H5D_CHUNKED:
-                HDstrcpy(slayout,"chunked");
+                strcpy(slayout,"chunked");
                 break;
             case H5D_LAYOUT_ERROR:
             case H5D_NLAYOUTS:
                 error_msg("invalid layout\n");
                 return -1;
             default:
-                HDstrcpy(slayout,"invalid layout\n");
+                strcpy(slayout,"invalid layout\n");
                 return -1;
             }
             printf(" Apply %s layout to all\n", slayout);
@@ -999,7 +999,7 @@ static const char* get_sfilter(H5Z_filter_t filtn)
         return "SOFF";
     else {
         error_msg("input error in filter type\n");
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 }
 
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 9a09b9e..62cdd6b 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -574,7 +574,7 @@ int do_copy_objects(hid_t fidin,
         {
 
         case H5TRAV_TYPE_UNKNOWN:
-            assert(0);
+            HDassert(0);
             break;
             /*-------------------------------------------------------------------------
             * H5TRAV_TYPE_GROUP
@@ -877,7 +877,7 @@ int do_copy_objects(hid_t fidin,
                                         size = 1;
                                     sm_size[k - 1] = MIN(dims[k - 1], size);
                                     sm_nbytes *= sm_size[k - 1];
-                                    assert(sm_nbytes > 0);
+                                    HDassert(sm_nbytes > 0);
                                 }
                                 sm_buf = HDmalloc((size_t)sm_nbytes);
 
@@ -885,8 +885,8 @@ int do_copy_objects(hid_t fidin,
                                 sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
 
                                 /* the stripmine loop */
-                                memset(hs_offset, 0, sizeof hs_offset);
-                                memset(zero, 0, sizeof zero);
+                                HDmemset(hs_offset, 0, sizeof hs_offset);
+                                HDmemset(zero, 0, sizeof zero);
 
                                 for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts)
                                 {
@@ -1301,7 +1301,7 @@ copy_user_block(const char *infile, const char *outfile, hsize_t size)
     int status = 0;                     /* Return value */
 
     /* User block must be any power of 2 equal to 512 or greater (512, 1024, 2048, etc.) */
-    assert(size > 0);
+    HDassert(size > 0);
 
     /* Open files */
     if((infid = HDopen(infile, O_RDONLY, 0)) < 0) {
@@ -1343,13 +1343,13 @@ copy_user_block(const char *infile, const char *outfile, hsize_t size)
                 status = -1;
                 goto done;
             } /* end if */
-            assert(nwritten > 0);
-            assert(nwritten <= nbytes);
+            HDassert(nwritten > 0);
+            HDassert(nwritten <= nbytes);
 
             /* Update # of bytes left & offset in buffer */
             nbytes -= nwritten;
             wbuf += nwritten;
-            assert(nbytes == 0 || wbuf < (rbuf + USERBLOCK_XFER_SIZE));
+            HDassert(nbytes == 0 || wbuf < (rbuf + USERBLOCK_XFER_SIZE));
         } /* end while */
 
         /* Update size of userblock left to transfer */
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 213ff65..7edeed2 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -15,6 +15,7 @@
 
 #include "h5repack.h"
 #include "h5tools.h"
+#include "h5tools_utils.h"
 
 /* number of members in an array */
 #ifndef NELMTS
@@ -329,7 +330,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
                     size = 1;
                 sm_size[i - 1] = MIN(dims[i - 1], size);
                 sm_nbytes *= sm_size[i - 1];
-                assert(sm_nbytes > 0);
+                HDassert(sm_nbytes > 0);
 
             }
 
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 2e73721..06a4aa7 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -13,6 +13,7 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#include "h5tools.h"
 #include "h5tools_utils.h"
 #include "h5repack.h"
 
@@ -104,6 +105,9 @@ int main(int argc, const char **argv)
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
+    /* Initialize h5tools lib */
+    h5tools_init();
+
     /* initialize options  */
     h5repack_init(&options,0);
 
@@ -122,7 +126,7 @@ int main(int argc, const char **argv)
             {
                 error_msg("file names cannot be the same\n");
                 usage(h5tools_getprogname());
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
 
             }
         }
@@ -131,7 +135,7 @@ int main(int argc, const char **argv)
         {
             error_msg("file names missing\n");
             usage(h5tools_getprogname());
-            exit(EXIT_FAILURE);
+            HDexit(EXIT_FAILURE);
         }
     }
 
@@ -304,10 +308,10 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
         case 'h':
             usage(h5tools_getprogname());
-            exit(EXIT_SUCCESS);
+            HDexit(EXIT_SUCCESS);
         case 'V':
             print_version(h5tools_getprogname());
-            exit(EXIT_SUCCESS);
+            HDexit(EXIT_SUCCESS);
         case 'v':
             options->verbose = 1;
             break;
@@ -317,7 +321,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
             if (h5repack_addfilter( opt_arg, options)<0)
             {
                 error_msg("in parsing filter\n");
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
         case 'l':
@@ -326,7 +330,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
             if (h5repack_addlayout( opt_arg, options)<0)
             {
                 error_msg("in parsing layout\n");
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
 
@@ -337,7 +341,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
             if ((int)options->min_comp<=0)
             {
                 error_msg("invalid minimum compress size <%s>\n", opt_arg );
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
 
@@ -430,7 +434,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
             if ( options->alignment < 1 )
             {
                 error_msg("invalid alignment size\n", opt_arg );
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
 
@@ -446,7 +450,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
         {
             error_msg("missing file names\n");
             usage(h5tools_getprogname());
-            exit(EXIT_FAILURE);
+            HDexit(EXIT_FAILURE);
         }
     }
 
@@ -481,15 +485,15 @@ void read_info(const char *filename,
 
     /* compose the name of the file to open, using the srcdir, if appropriate */
     if (srcdir){
-        strcpy(data_file,srcdir);
-        strcat(data_file,"/");
+        HDstrcpy(data_file,srcdir);
+        HDstrcat(data_file,"/");
     }
-    strcat(data_file,filename);
+    HDstrcat(data_file,filename);
 
 
     if ((fp = fopen(data_file, "r")) == (FILE *)NULL) {
         error_msg("cannot open options file %s\n", filename);
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 
     /* cycle until end of file reached */
@@ -526,7 +530,7 @@ void read_info(const char *filename,
 
             if (h5repack_addfilter(comp_info,options)==-1){
                 error_msg("could not add compression option\n");
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
         }
         /*-------------------------------------------------------------------------
@@ -556,7 +560,7 @@ void read_info(const char *filename,
 
             if (h5repack_addlayout(comp_info,options)==-1){
                 error_msg("could not add chunck option\n");
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
         }
         /*-------------------------------------------------------------------------
@@ -565,7 +569,7 @@ void read_info(const char *filename,
         */
         else {
             error_msg("bad file format for %s", filename);
-            exit(EXIT_FAILURE);
+            HDexit(EXIT_FAILURE);
         }
     }
 
diff --git a/tools/h5repack/h5repack_opttable.c b/tools/h5repack/h5repack_opttable.c
index 57b5fa7..d0fcff3 100644
--- a/tools/h5repack/h5repack_opttable.c
+++ b/tools/h5repack/h5repack_opttable.c
@@ -14,6 +14,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "h5repack.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 /*-------------------------------------------------------------------------
@@ -120,7 +121,7 @@ static int aux_inctable(pack_opttbl_t *table, int n_objs )
     unsigned int i;
 
     table->size += n_objs;
-    table->objs = (pack_info_t*)realloc(table->objs, table->size * sizeof(pack_info_t));
+    table->objs = (pack_info_t*)HDrealloc(table->objs, table->size * sizeof(pack_info_t));
     if (table->objs==NULL) {
         error_msg("not enough memory for options table\n");
         return -1;
@@ -147,7 +148,7 @@ int options_table_init( pack_opttbl_t **tbl )
     unsigned int i;
     pack_opttbl_t *table;
 
-    if(NULL == (table = (pack_opttbl_t *)malloc(sizeof(pack_opttbl_t))))
+    if(NULL == (table = (pack_opttbl_t *)HDmalloc(sizeof(pack_opttbl_t))))
     {
         error_msg("not enough memory for options table\n");
         return -1;
@@ -155,10 +156,10 @@ int options_table_init( pack_opttbl_t **tbl )
 
     table->size   = 30;
     table->nelems = 0;
-    if(NULL == (table->objs = (pack_info_t*)malloc(table->size * sizeof(pack_info_t))))
+    if(NULL == (table->objs = (pack_info_t*)HDmalloc(table->size * sizeof(pack_info_t))))
     {
         error_msg("not enough memory for options table\n");
-        free(table);
+        HDfree(table);
         return -1;
     }
 
@@ -182,8 +183,8 @@ int options_table_init( pack_opttbl_t **tbl )
 
 int options_table_free( pack_opttbl_t *table )
 {
-    free(table->objs);
-    free(table);
+    HDfree(table->objs);
+    HDfree(table);
     return 0;
 }
 
@@ -229,7 +230,7 @@ int options_add_layout( obj_list_t *obj_list,
                     if (table->objs[i].chunk.rank>0)
                     {
                         error_msg("chunk information already inserted for <%s>\n",obj_list[j].obj);
-                        exit(EXIT_FAILURE);
+                        HDexit(EXIT_FAILURE);
                     }
                     /* insert the layout info */
                     else
diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index d3c6014..70eadd2 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -14,6 +14,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "h5repack.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 /*-------------------------------------------------------------------------
@@ -52,7 +53,7 @@ obj_list_t* parse_filter(const char *str,
 {
     unsigned    i, u;
     char        c;
-    size_t      len=strlen(str);
+    size_t      len=HDstrlen(str);
     int         j, m, n, k, l, end_obj=-1, no_param=0;
     char        sobj[MAX_NC_NAME];
     char        scomp[10];
@@ -63,7 +64,7 @@ obj_list_t* parse_filter(const char *str,
 
 
     /* initialize compression  info */
-    memset(filt,0,sizeof(filter_info_t));
+    HDmemset(filt,0,sizeof(filter_info_t));
     *is_glb = 0;
 
     /* check for the end of object list and number of objects */
@@ -88,7 +89,7 @@ obj_list_t* parse_filter(const char *str,
     }
 
     n++;
-    obj_list = (obj_list_t*) malloc(n*sizeof(obj_list_t));
+    obj_list = (obj_list_t*) HDmalloc(n*sizeof(obj_list_t));
     if (obj_list==NULL)
     {
         error_msg("could not allocate object list\n");
@@ -105,7 +106,7 @@ obj_list_t* parse_filter(const char *str,
         {
             if ( c==',') sobj[k]='\0'; else sobj[k+1]='\0';
             HDstrcpy(obj_list[n].obj,sobj);
-            memset(sobj,0,sizeof(sobj));
+            HDmemset(sobj,0,sizeof(sobj));
             n++;
             k=-1;
         }
@@ -113,9 +114,9 @@ obj_list_t* parse_filter(const char *str,
     /* nothing after : */
     if (end_obj+1==(int)len)
     {
-        if (obj_list) free(obj_list);
+        if (obj_list) HDfree(obj_list);
         error_msg("input Error: Invalid compression type in <%s>\n",str);
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 
 
@@ -151,9 +152,9 @@ obj_list_t* parse_filter(const char *str,
                         }
                         c = str[u];
                         if (!isdigit(c) && l==-1){
-                            if (obj_list) free(obj_list);
+                            if (obj_list) HDfree(obj_list);
                             error_msg("compression parameter not digit in <%s>\n",str);
-                            exit(EXIT_FAILURE);
+                            HDexit(EXIT_FAILURE);
                         }
                         if (l==-1)
                             stype[m]=c;
@@ -173,7 +174,7 @@ obj_list_t* parse_filter(const char *str,
                                 else
                                 {
                                     error_msg("szip mask must be 'NN' or 'EC' \n");
-                                    exit(EXIT_FAILURE);
+                                    HDexit(EXIT_FAILURE);
                                 }
 
 
@@ -211,9 +212,9 @@ obj_list_t* parse_filter(const char *str,
                         }
                         c = str[u];
                         if (!isdigit(c) && l==-1){
-                            if (obj_list) free(obj_list);
+                            if (obj_list) HDfree(obj_list);
                             error_msg("compression parameter is not a digit in <%s>\n",str);
-                            exit(EXIT_FAILURE);
+                            HDexit(EXIT_FAILURE);
                         }
                         if (l==-1)
                             stype[m]=c;
@@ -233,7 +234,7 @@ obj_list_t* parse_filter(const char *str,
                                 else
                                 {
                                     error_msg("scale type must be 'IN' or 'DS' \n");
-                                    exit(EXIT_FAILURE);
+                                    HDexit(EXIT_FAILURE);
                                 }
 
                             }
@@ -255,9 +256,9 @@ obj_list_t* parse_filter(const char *str,
                     {
                         c = str[u];
                         if (!isdigit(c)){
-                            if (obj_list) free(obj_list);
+                            if (obj_list) HDfree(obj_list);
                             error_msg("compression parameter is not a digit in <%s>\n",str);
-                            exit(EXIT_FAILURE);
+                            HDexit(EXIT_FAILURE);
                         }
                         stype[m]=c;
                     } /* u */
@@ -301,9 +302,9 @@ obj_list_t* parse_filter(const char *str,
        filt->cd_nelmts = 1;
        if (no_param)
        { /*no more parameters, GZIP must have parameter */
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("missing compression parameter in <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
    }
 
@@ -317,9 +318,9 @@ obj_list_t* parse_filter(const char *str,
        filt->cd_nelmts = 2;
        if (no_param)
        { /*no more parameters, SZIP must have parameter */
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("missing compression parameter in <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
    }
 
@@ -333,9 +334,9 @@ obj_list_t* parse_filter(const char *str,
        filt->cd_nelmts = 0;
        if (m>0)
        { /*shuffle does not have parameter */
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("extra parameter in SHUF <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
    }
   /*-------------------------------------------------------------------------
@@ -348,9 +349,9 @@ obj_list_t* parse_filter(const char *str,
        filt->cd_nelmts = 0;
        if (m>0)
        { /*shuffle does not have parameter */
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("extra parameter in FLET <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
    }
   /*-------------------------------------------------------------------------
@@ -363,9 +364,9 @@ obj_list_t* parse_filter(const char *str,
        filt->cd_nelmts = 0;
        if (m>0)
        { /*nbit does not have parameter */
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("extra parameter in NBIT <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
    }
   /*-------------------------------------------------------------------------
@@ -378,15 +379,15 @@ obj_list_t* parse_filter(const char *str,
        filt->cd_nelmts = 2;
        if (no_param)
        { /*no more parameters, SOFF must have parameter */
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("missing compression parameter in <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
    }
    else {
-       if (obj_list) free(obj_list);
+       if (obj_list) HDfree(obj_list);
        error_msg("invalid filter type in <%s>\n",str);
-       exit(EXIT_FAILURE);
+       HDexit(EXIT_FAILURE);
    }
   }
  } /*i*/
@@ -407,9 +408,9 @@ obj_list_t* parse_filter(const char *str,
    case H5Z_FILTER_DEFLATE:
        if (filt->cd_values[0]>9 )
        {
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("invalid compression parameter in <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
        break;
 
@@ -422,21 +423,21 @@ obj_list_t* parse_filter(const char *str,
        pixels_per_block=filt->cd_values[0];
        if ((pixels_per_block%2)==1)
        {
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("pixels_per_block is not even in <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
        if (pixels_per_block>H5_SZIP_MAX_PIXELS_PER_BLOCK)
        {
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("pixels_per_block is too large in <%s>\n",str);
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
        if ( (HDstrcmp(smask,"NN")!=0) && (HDstrcmp(smask,"EC")!=0) )
        {
-           if (obj_list) free(obj_list);
+           if (obj_list) HDfree(obj_list);
            error_msg("szip mask must be 'NN' or 'EC' \n");
-           exit(EXIT_FAILURE);
+           HDexit(EXIT_FAILURE);
        }
        break;
    default:
@@ -479,16 +480,16 @@ obj_list_t* parse_layout(const char *str,
     obj_list_t* obj_list=NULL;
     unsigned    i;
     char        c;
-    size_t      len=strlen(str);
+    size_t      len=HDstrlen(str);
     int         j, n, k, end_obj=-1, c_index;
     char        sobj[MAX_NC_NAME];
     char        sdim[10];
     char        slayout[10];
 
 
-    memset(sdim, '\0', sizeof(sdim));
-    memset(sobj, '\0', sizeof(sobj));
-    memset(slayout, '\0', sizeof(slayout));
+    HDmemset(sdim, '\0', sizeof(sdim));
+    HDmemset(sobj, '\0', sizeof(sobj));
+    HDmemset(slayout, '\0', sizeof(slayout));
 
     /* check for the end of object list and number of objects */
     for ( i=0, n=0; i<len; i++)
@@ -509,7 +510,7 @@ obj_list_t* parse_layout(const char *str,
     }
 
     n++;
-    obj_list = (obj_list_t*) malloc(n*sizeof(obj_list_t));
+    obj_list = (obj_list_t*) HDmalloc(n*sizeof(obj_list_t));
     if (obj_list==NULL)
     {
         error_msg("could not allocate object list\n");
@@ -526,7 +527,7 @@ obj_list_t* parse_layout(const char *str,
         {
             if ( c==',') sobj[k]='\0'; else sobj[k+1]='\0';
             HDstrcpy(obj_list[n].obj,sobj);
-            memset(sobj,0,sizeof(sobj));
+            HDmemset(sobj,0,sizeof(sobj));
             n++;
             k=-1;
         }
@@ -535,9 +536,9 @@ obj_list_t* parse_layout(const char *str,
     /* nothing after : */
     if (end_obj+1==(int)len)
     {
-        if (obj_list) free(obj_list);
+        if (obj_list) HDfree(obj_list);
         error_msg("in parse layout, no characters after : in <%s>\n",str);
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 
     /* get layout info */
@@ -554,7 +555,7 @@ obj_list_t* parse_layout(const char *str,
                 pack->layout=H5D_CHUNKED;
             else {
                 error_msg("in parse layout, not a valid layout in <%s>\n",str);
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
         }
         else
@@ -576,9 +577,9 @@ obj_list_t* parse_layout(const char *str,
 
         if (j>(int)len)
         {
-            if (obj_list) free(obj_list);
+            if (obj_list) HDfree(obj_list);
             error_msg("in parse layout,  <%s> Chunk dimensions missing\n",str);
-            exit(EXIT_FAILURE);
+            HDexit(EXIT_FAILURE);
         }
 
         for ( i=j, c_index=0; i<len; i++)
@@ -590,10 +591,10 @@ obj_list_t* parse_layout(const char *str,
             if (!isdigit(c) && c!='x'
                 && c!='N' && c!='O' && c!='N' && c!='E'
                 ){
-                if (obj_list) free(obj_list);
+                if (obj_list) HDfree(obj_list);
                 error_msg("in parse layout, <%s> Not a valid character in <%s>\n",
                     sdim,str);
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
 
             if ( c=='x' || i==len-1)
@@ -603,10 +604,10 @@ obj_list_t* parse_layout(const char *str,
                     k=0;
                     pack->chunk.chunk_lengths[c_index]=atoi(sdim);
                     if (pack->chunk.chunk_lengths[c_index]==0) {
-                        if (obj_list) free(obj_list);
+                        if (obj_list) HDfree(obj_list);
                         error_msg("in parse layout, <%s> conversion to number in <%s>\n",
                             sdim,str);
-                        exit(EXIT_FAILURE);
+                        HDexit(EXIT_FAILURE);
                     }
                     c_index++;
                 }
@@ -621,10 +622,10 @@ obj_list_t* parse_layout(const char *str,
                     {
                         pack->chunk.chunk_lengths[c_index]=atoi(sdim);
                         if (pack->chunk.chunk_lengths[c_index]==0){
-                            if (obj_list) free(obj_list);
+                            if (obj_list) HDfree(obj_list);
                             error_msg("in parse layout, <%s> conversion to number in <%s>\n",
                                 sdim,str);
-                            exit(EXIT_FAILURE);
+                            HDexit(EXIT_FAILURE);
                         }
                         pack->chunk.rank=c_index+1;
                     }
diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index a79326d..3b2a95b 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -327,7 +327,7 @@ int do_copy_refobjs(hid_t fidin,
                             goto error;
                     } /* end else */
 
-                    assert(dset_out != FAIL);
+                    HDassert(dset_out != FAIL);
 
                     /*-------------------------------------------------------------------------
                     * copy referenced objects in attributes
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 2aabd46..986a7d0 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -14,11 +14,12 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "h5repack.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 /* number of members in an array */
 #ifndef NELMTS
-#    define NELMTS(X)		(sizeof(X)/sizeof(X[0]))
+#    define NELMTS(X)    (sizeof(X)/sizeof(X[0]))
 #endif
 
 static int verify_layout(hid_t pid, pack_info_t *obj);
@@ -222,9 +223,9 @@ error:
  *
  * Purpose: verify which layout is present in the property list DCPL_ID
  *
- *  H5D_COMPACT	  	= 0
- *  H5D_CONTIGUOUS	= 1
- *  H5D_CHUNKED		= 2
+ *  H5D_COMPACT      = 0
+ *  H5D_CONTIGUOUS  = 1
+ *  H5D_CHUNKED    = 2
  *
  * Return: 1 has, 0 does not, -1 error
  *
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);
     }
 
     /*
diff --git a/tools/h5repack/testh5repack_detect_szip.c b/tools/h5repack/testh5repack_detect_szip.c
index 332fcc5..e91b2f7 100644
--- a/tools/h5repack/testh5repack_detect_szip.c
+++ b/tools/h5repack/testh5repack_detect_szip.c
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include "h5repack.h"
 #include "h5tools.h"
+#include "h5tools_utils.h"
 #include "h5test.h"
 
 
@@ -47,6 +48,9 @@ int main(void)
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
+    /* Initialize h5tools lib */
+    h5tools_init();
+
 #ifdef H5_HAVE_FILTER_SZIP
     if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1) {
         printf("yes\n");