[svn-r18759] pull r18757 from 1.8 branch

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 error_mesg() and warn_mesg() to remove progname argument and use get functions

Tested:
   Windows, linux

4 files changed, 16 insertions, 15 deletions

diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 75e1774..cf54a35 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -23,10 +23,6 @@ static int check_n_input( const char* );
 static int check_p_input( const char* );
 static int check_d_input( const char* );
 
-
-/* module-scoped variables */
-const char  *progname = "h5diff";
-
 /*
  * Command-line options: The user can specify short or long-named
  * parameters.
@@ -90,7 +86,7 @@ void parse_command_line(int argc,
             usage();
             h5diff_exit(EXIT_SUCCESS);
         case 'V':
-            print_version(progname);
+            print_version(h5tools_getprogname());
             h5diff_exit(EXIT_SUCCESS);
         case 'v':
             options->m_verbose = 1;
@@ -174,7 +170,7 @@ void parse_command_line(int argc,
     /* check for file names to be processed */
     if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL)
     {
-        error_msg(progname, "missing file names\n");
+        error_msg("missing file names\n");
         usage();
         h5diff_exit(EXIT_FAILURE);
     }
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 8089161..297eb48 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -20,6 +20,9 @@
 #include "h5diff_common.h"
 #include "h5tools_utils.h"
 
+/* Name of tool */
+#define PROGRAMNAME "h5diff"
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -68,9 +71,6 @@
  */
 
 
-/* module-scoped variables */
-int d_status = EXIT_SUCCESS;
-
 int main(int argc, const char *argv[])
 {
     int        ret;
@@ -81,6 +81,8 @@ int main(int argc, const char *argv[])
     hsize_t    nfound=0;
     diff_opt_t options;
 
+    h5tools_setprogname(PROGRAMNAME);
+    h5tools_setstatus(EXIT_SUCCESS);
     /*-------------------------------------------------------------------------
     * process the command-line
     *-------------------------------------------------------------------------
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 57abc04..26adbf4 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -20,6 +20,9 @@
 #include "h5tools.h"
 
 
+/* Name of tool */
+#define PROGRAMNAME "h5diffgentest"
+
 /*-------------------------------------------------------------------------
 * Program: h5diffgentest
 *
@@ -114,9 +117,6 @@ static int write_dset(hid_t loc_id,int rank,hsize_t *dims,const char *name,hid_t
 *-------------------------------------------------------------------------
 */
 
-/* module-scoped variables */
-int d_status = EXIT_SUCCESS;
-
 int main(void)
 {
     test_basic(FILE1, FILE2, FILE11);
diff --git a/tools/h5diff/ph5diff_main.c b/tools/h5diff/ph5diff_main.c
index 1990138..7a43c73 100644
--- a/tools/h5diff/ph5diff_main.c
+++ b/tools/h5diff/ph5diff_main.c
@@ -20,6 +20,9 @@
 #include <assert.h>
 #include "h5diff_common.h"
 
+/* Name of tool */
+#define PROGRAMNAME "h5diff"
+
 static void ph5diff_worker(int );
 
 /*-------------------------------------------------------------------------
@@ -52,9 +55,6 @@ static void ph5diff_worker(int );
  *-------------------------------------------------------------------------
  */
 
-/* module-scoped variables */
-int d_status = EXIT_SUCCESS;
-
 int main(int argc, const char *argv[])
 {
     int        nID = 0;
@@ -64,6 +64,9 @@ int main(int argc, const char *argv[])
     const char *objname2  = NULL;
     diff_opt_t options;
 
+    h5tools_setprogname(PROGRAMNAME);
+    h5tools_setstatus(EXIT_SUCCESS);
+
     outBuffOffset = 0;
     g_Parallel = 1;