[svn-r22105] Description:

	Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously.  The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.

Tested on:
	Mac OSX/64 10.7.3 (amazon) w/debug

1 files changed, 38 insertions, 30 deletions

diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 6ec1647..a630559 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"
 
@@ -106,6 +107,13 @@ int main(int argc, const char **argv)
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
 
+    /* Initialize h5tools lib */
+    h5tools_init();
+
+    /* update hyperslab buffer size from H5TOOLS_BUFSIZE env if exist */
+    if ( h5tools_getenv_update_hyperslab_bufsize() < 0)
+        HDexit(EXIT_FAILURE);
+
     /* initialize options  */
     h5repack_init(&options, 0, 0, 0, (hsize_t)0);
 
@@ -124,7 +132,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);
 
             }
         }
@@ -133,7 +141,7 @@ int main(int argc, const char **argv)
         {
             error_msg("file names missing\n");
             usage(h5tools_getprogname());
-            exit(EXIT_FAILURE);
+            HDexit(EXIT_FAILURE);
         }
     }
 
@@ -316,10 +324,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;
@@ -329,7 +337,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':
@@ -338,18 +346,18 @@ 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;
 
 
         case 'm':
 
-            options->min_comp = atoi( opt_arg );
+            options->min_comp = HDatoi( opt_arg );
             if ((int)options->min_comp<=0)
             {
                 error_msg("invalid minimum compress size <%s>\n", opt_arg );
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
 
@@ -367,7 +375,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
         case 'c':
 
-            options->grp_compact = atoi( opt_arg );
+            options->grp_compact = HDatoi( opt_arg );
             if (options->grp_compact>0)
                 options->latest = 1; /* must use latest format */
             break;
@@ -375,7 +383,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
         case 'd':
 
-            options->grp_indexed = atoi( opt_arg );
+            options->grp_indexed = HDatoi( opt_arg );
             if (options->grp_indexed>0)
                 options->latest = 1; /* must use latest format */
             break;
@@ -390,7 +398,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
                 options->latest = 1; /* must use latest format */
                 if (msgPtr == NULL)
                 {
-                    ssize = atoi( opt_arg );
+                    ssize = HDatoi( opt_arg );
                     for (idx=0; idx<5; idx++)
                         options->msg_size[idx] = ssize;
                 }
@@ -399,7 +407,7 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
                     char msgType[10];
                     HDstrcpy(msgType, msgPtr+1);
                     msgPtr[0] = '\0';
-                    ssize = atoi( opt_arg );
+                    ssize = HDatoi( opt_arg );
                     if (HDstrncmp(msgType, "dspace",6) == 0) {
                         options->msg_size[0] = ssize;
                     }
@@ -428,26 +436,26 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
 
         case 'b':
 
-            options->ublock_size = (hsize_t)atol( opt_arg );
+            options->ublock_size = (hsize_t)HDatol( opt_arg );
             break;
 
         case 't':
 
-            options->threshold = (hsize_t)atol( opt_arg );
+            options->threshold = (hsize_t)HDatol( opt_arg );
             break;
 
         case 'a':
 
-            options->alignment = atol( opt_arg );
+            options->alignment = HDatol( opt_arg );
             if ( options->alignment < 1 )
             {
                 error_msg("invalid alignment size\n", opt_arg );
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
 
         case 'S':
-	{
+  {
             char strategy[MAX_NC_NAME];
 
             HDstrcpy(strategy, opt_arg);
@@ -461,14 +469,14 @@ void parse_command_line(int argc, const char **argv, pack_opt_t* options)
                 options->fs_strategy = H5F_FILE_SPACE_VFD;
             else {
                 error_msg("invalid file space management strategy\n", opt_arg );
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
             break;
         }
 
         case 'T':
 
-            options->fs_threshold = (hsize_t)atol( opt_arg );
+            options->fs_threshold = (hsize_t)HDatol( opt_arg );
             break;
         } /* switch */
 
@@ -482,7 +490,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);
         }
     }
 
@@ -513,9 +521,9 @@ void read_info(const char *filename,
     char c;
     int  i, rc=1;
 
-    if ((fp = fopen(filename, "r")) == (FILE *)NULL) {
+    if ((fp = HDfopen(filename, "r")) == (FILE *)NULL) {
         error_msg("cannot open options file %s\n", filename);
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 
     /* cycle until end of file reached */
@@ -536,7 +544,7 @@ void read_info(const char *filename,
             while( c!=' ' )
             {
                 fscanf(fp, "%c", &c);
-                if (feof(fp)) break;
+                if (HDfeof(fp)) break;
             }
             c='0';
             /* go until end */
@@ -545,14 +553,14 @@ void read_info(const char *filename,
                 fscanf(fp, "%c", &c);
                 comp_info[i]=c;
                 i++;
-                if (feof(fp)) break;
+                if (HDfeof(fp)) break;
                 if (c==10 /*eol*/) break;
             }
             comp_info[i-1]='\0'; /*cut the last " */
 
             if (h5repack_addfilter(comp_info,options)==-1){
                 error_msg("could not add compression option\n");
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
         }
         /*-------------------------------------------------------------------------
@@ -566,7 +574,7 @@ void read_info(const char *filename,
             while( c!=' ' )
             {
                 fscanf(fp, "%c", &c);
-                if (feof(fp)) break;
+                if (HDfeof(fp)) break;
             }
             c='0';
             /* go until end */
@@ -575,14 +583,14 @@ void read_info(const char *filename,
                 fscanf(fp, "%c", &c);
                 comp_info[i]=c;
                 i++;
-                if (feof(fp)) break;
+                if (HDfeof(fp)) break;
                 if (c==10 /*eol*/) break;
             }
             comp_info[i-1]='\0'; /*cut the last " */
 
             if (h5repack_addlayout(comp_info,options)==-1){
                 error_msg("could not add chunck option\n");
-                exit(EXIT_FAILURE);
+                HDexit(EXIT_FAILURE);
             }
         }
         /*-------------------------------------------------------------------------
@@ -591,10 +599,10 @@ void read_info(const char *filename,
         */
         else {
             error_msg("bad file format for %s", filename);
-            exit(EXIT_FAILURE);
+            HDexit(EXIT_FAILURE);
         }
     }
 
-    fclose(fp);
+    HDfclose(fp);
     return;
 }