[svn-r18757] Enable tools lib to be built as a dll on windows. Added two get/set functions for progname and d_status.

Also add windows import/export declarations to functions.
Updated windows - H5pubconf.h for packed bits function

Tested:
   Windows, linux

1 files changed, 24 insertions, 25 deletions

diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 4376390..b4c191c 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -30,7 +30,6 @@
 * globals
 *-------------------------------------------------------------------------
 */
-extern char  *progname;
 
 /*-------------------------------------------------------------------------
 * macros
@@ -90,7 +89,7 @@ int copy_objects(const char* fnamein,
     */
     if((fidin = h5tools_fopen(fnamein, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
     {
-        error_msg(progname, "<%s>: %s\n", fnamein, H5FOPENERROR );
+        error_msg(h5tools_getprogname(), "<%s>: %s\n", fnamein, H5FOPENERROR );
         goto out;
     }
 
@@ -100,19 +99,19 @@ int copy_objects(const char* fnamein,
 
         if((fcpl_in = H5Fget_create_plist(fidin)) < 0)
         {
-            error_msg(progname, "failed to retrieve file creation property list\n");
+            error_msg(h5tools_getprogname(), "failed to retrieve file creation property list\n");
             goto out;
         }
 
         if(H5Pget_userblock(fcpl_in, &ub_size) < 0)
         {
-            error_msg(progname, "failed to retrieve userblock size\n");
+            error_msg(h5tools_getprogname(), "failed to retrieve userblock size\n");
             goto out;
         }
 
         if(H5Pclose(fcpl_in) < 0)
         {
-            error_msg(progname, "failed to close property list\n");
+            error_msg(h5tools_getprogname(), "failed to close property list\n");
             goto out;
         }
     }
@@ -123,7 +122,7 @@ int copy_objects(const char* fnamein,
         /* Create file creation property list */
         if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
         {
-            error_msg(progname, "fail to create a file creation property list\n");
+            error_msg(h5tools_getprogname(), "fail to create a file creation property list\n");
             goto out;
         }
 
@@ -131,7 +130,7 @@ int copy_objects(const char* fnamein,
         {
             if(H5Pset_userblock(fcpl, ub_size) < 0)
             {
-                error_msg(progname, "failed to set non-default userblock size\n");
+                error_msg(h5tools_getprogname(), "failed to set non-default userblock size\n");
                 goto out;
             }
         }
@@ -144,7 +143,7 @@ int copy_objects(const char* fnamein,
             /* (So that it is created in "dense storage" form) */
             if(H5Pset_link_phase_change(fcpl, (unsigned)options->grp_compact, (unsigned)options->grp_indexed) < 0)
             {
-                error_msg(progname, "fail to adjust group creation parameters for root group\n");
+                error_msg(h5tools_getprogname(), "fail to adjust group creation parameters for root group\n");
                 goto out;
             }
 
@@ -186,7 +185,7 @@ int copy_objects(const char* fnamein,
             {
                 if(H5Pset_shared_mesg_nindexes(fcpl, nindex) < 0)
                 {
-                    error_msg(progname, "fail to set the number of shared object header message indexes\n");
+                    error_msg(h5tools_getprogname(), "fail to set the number of shared object header message indexes\n");
                     goto out;
                 }
 
@@ -194,7 +193,7 @@ int copy_objects(const char* fnamein,
                 for(i = 0; i < (nindex - 1); i++)
                 {
                     if(H5Pset_shared_mesg_index(fcpl, i, mesg_type_flags[i], min_mesg_sizes[i]) < 0) {
-                        error_msg(progname, "fail to configure the specified shared object header message index\n");
+                        error_msg(h5tools_getprogname(), "fail to configure the specified shared object header message index\n");
                         goto out;
                     } /* end if */
                 } /* end for */
@@ -203,13 +202,13 @@ int copy_objects(const char* fnamein,
             /* Create file access property list */
             if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
             {
-                error_msg(progname, "Could not create file access property list\n");
+                error_msg(h5tools_getprogname(), "Could not create file access property list\n");
                 goto out;
             } /* end if */
 
             if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
             {
-                error_msg(progname, "Could not set property for using latest version of the format\n");
+                error_msg(h5tools_getprogname(), "Could not set property for using latest version of the format\n");
                 goto out;
             } /* end if */
         } /* end if */
@@ -236,7 +235,7 @@ int copy_objects(const char* fnamein,
             /* set user block size */
             if(H5Pset_userblock(fcpl, options->ublock_size) < 0)
             {
-                error_msg(progname, "failed to set userblock size\n");
+                error_msg(h5tools_getprogname(), "failed to set userblock size\n");
                 goto out;
             }
 
@@ -248,14 +247,14 @@ int copy_objects(const char* fnamein,
             /* create a file creation property list */
             if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
             {
-                error_msg(progname, "fail to create a file creation property list\n");
+                error_msg(h5tools_getprogname(), "fail to create a file creation property list\n");
                 goto out;
             }
 
             /* set user block size */
             if(H5Pset_userblock(fcpl, options->ublock_size) < 0)
             {
-                error_msg(progname, "failed to set userblock size\n");
+                error_msg(h5tools_getprogname(), "failed to set userblock size\n");
                 goto out;
             }
 
@@ -280,7 +279,7 @@ int copy_objects(const char* fnamein,
 
             if (H5Pset_alignment(fapl, options->threshold, options->alignment) < 0)
             {
-                error_msg(progname, "failed to set alignment\n");
+                error_msg(h5tools_getprogname(), "failed to set alignment\n");
                 goto out;
             }
 
@@ -292,13 +291,13 @@ int copy_objects(const char* fnamein,
             /* create a file access property list */
             if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
             {
-                error_msg(progname, "Could not create file access property list\n");
+                error_msg(h5tools_getprogname(), "Could not create file access property list\n");
                 goto out;
             }
 
             if (H5Pset_alignment(fapl, options->threshold, options->alignment) < 0)
             {
-                error_msg(progname, "failed to set alignment\n");
+                error_msg(h5tools_getprogname(), "failed to set alignment\n");
                 goto out;
             }
 
@@ -319,7 +318,7 @@ int copy_objects(const char* fnamein,
 
     if((fidout = H5Fcreate(fnameout,H5F_ACC_TRUNC, fcpl, fapl)) < 0)
     {
-        error_msg(progname, "<%s>: Could not create file\n", fnameout );
+        error_msg(h5tools_getprogname(), "<%s>: Could not create file\n", fnameout );
         goto out;
     }
 
@@ -332,7 +331,7 @@ int copy_objects(const char* fnamein,
     {
         if ( copy_user_block( options->ublock_filename, fnameout, options->ublock_size) < 0 )
         {
-            error_msg(progname, "Could not copy user block. Exiting...\n");
+            error_msg(h5tools_getprogname(), "Could not copy user block. Exiting...\n");
             goto out;
 
         }
@@ -356,7 +355,7 @@ int copy_objects(const char* fnamein,
     */
     if(do_copy_objects(fidin, fidout, travt, options) < 0)
     {
-        error_msg(progname, "<%s>: Could not copy data to: %s\n", fnamein, fnameout);
+        error_msg(h5tools_getprogname(), "<%s>: Could not copy data to: %s\n", fnamein, fnameout);
         goto out;
     } /* end if */
 
@@ -398,7 +397,7 @@ int copy_objects(const char* fnamein,
     {
         if ( copy_user_block(fnamein, fnameout, ub_size) < 0 )
         {
-            error_msg(progname, "Could not copy user block. Exiting...\n");
+            error_msg(h5tools_getprogname(), "Could not copy user block. Exiting...\n");
             goto out;
 
         }
@@ -1362,19 +1361,19 @@ void print_user_block(const char *filename, hid_t fid)
     /* get user block size */
     if(( fcpl = H5Fget_create_plist(fid)) < 0)
     {
-        error_msg(progname, "failed to retrieve file creation property list\n");
+        error_msg(h5tools_getprogname(), "failed to retrieve file creation property list\n");
         goto done;
     }
 
     if(H5Pget_userblock(fcpl, &ub_size) < 0)
     {
-        error_msg(progname, "failed to retrieve userblock size\n");
+        error_msg(h5tools_getprogname(), "failed to retrieve userblock size\n");
         goto done;
     }
 
     if(H5Pclose(fcpl) < 0)
     {
-        error_msg(progname, "failed to close property list\n");
+        error_msg(h5tools_getprogname(), "failed to close property list\n");
         goto done;
     }