1 files changed, 20 insertions, 16 deletions

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);
         }
     }