[mpich2-commits] r4133 - in mpich2/trunk/src/pm/hydra: include launcher/mpiexec utils/string

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-19 18:37:55 -0500 (Thu, 19 Mar 2009)
New Revision: 4133

Modified:
   mpich2/trunk/src/pm/hydra/include/hydra_base.h
   mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c
   mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
   mpich2/trunk/src/pm/hydra/utils/string/string.c
Log:
The compiler doesn't seem to be very happy about comparing a constant
string against NULL. Use empty strings instead to keep it happier.


Modified: mpich2/trunk/src/pm/hydra/include/hydra_base.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_base.h	2009-03-19 20:56:27 UTC (rev 4132)
+++ mpich2/trunk/src/pm/hydra/include/hydra_base.h	2009-03-19 23:37:55 UTC (rev 4133)
@@ -70,7 +70,7 @@
 #define HYDU_ERR_POP(status, message)                                   \
     {                                                                   \
         if (status != HYD_SUCCESS && status != HYD_GRACEFUL_ABORT) {    \
-            if (message)                                                \
+            if (strcmp(message, ""))                                    \
                 HYDU_Error_printf(message);                             \
             goto fn_fail;                                               \
         }                                                               \
@@ -83,7 +83,7 @@
     {                                                                   \
         status = error;                                                 \
         if (status != HYD_SUCCESS && status != HYD_GRACEFUL_ABORT) {    \
-            if (message)                                                \
+            if (strcmp(message, ""))                                    \
                 HYDU_Error_printf(message);                             \
             goto fn_fail;                                               \
         }                                                               \
@@ -96,7 +96,7 @@
     {                                                                   \
         status = error;                                                 \
         if (status != HYD_SUCCESS && status != HYD_GRACEFUL_ABORT) {    \
-            if (message)                                                \
+            if (strcmp(message, ""))                                    \
                 HYDU_Error_printf(message, arg1);                       \
             goto fn_fail;                                               \
         }                                                               \
@@ -109,7 +109,7 @@
     {                                                                   \
         status = error;                                                 \
         if (status != HYD_SUCCESS && status != HYD_GRACEFUL_ABORT) {    \
-            if (message)                                                \
+            if (strcmp(message, ""))                                    \
                 HYDU_Error_printf(message, arg1, arg2);                 \
             goto fn_fail;                                               \
         }                                                               \

Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c	2009-03-19 20:56:27 UTC (rev 4132)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c	2009-03-19 23:37:55 UTC (rev 4133)
@@ -66,7 +66,7 @@
 
     if (handle.debug) {
         status = HYD_LCHI_Print_parameters();
-        HYDU_ERR_POP(status, NULL);
+        HYDU_ERR_POP(status, "");
     }
 
     /* Convert the host file to a host list */

Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-19 20:56:27 UTC (rev 4132)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-19 23:37:55 UTC (rev 4133)
@@ -114,7 +114,7 @@
         HYDU_ERR_POP(status, "string break returned error\n");
 
         if (!strcmp(str1, "-h") || !strcmp(str1, "--help") || !strcmp(str1, "-help"))
-            HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, NULL);
+            HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "");
 
         if (!strcmp(str1, "--verbose")) {
             if (handle.debug != -1)
@@ -125,7 +125,7 @@
 
         if (!strcmp(str1, "--version")) {
             show_version();
-            HYDU_ERR_SETANDJUMP(status, HYD_GRACEFUL_ABORT, NULL);
+            HYDU_ERR_SETANDJUMP(status, HYD_GRACEFUL_ABORT, "");
         }
 
         if (!strcmp(str1, "--bootstrap")) {

Modified: mpich2/trunk/src/pm/hydra/utils/string/string.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/string/string.c	2009-03-19 20:56:27 UTC (rev 4132)
+++ mpich2/trunk/src/pm/hydra/utils/string/string.c	2009-03-19 23:37:55 UTC (rev 4133)
@@ -42,7 +42,7 @@
     HYDU_FUNC_ENTER();
 
     if (str == NULL)
-        HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, NULL);
+        HYDU_ERR_SETANDJUMP(status, HYD_INTERNAL_ERROR, "");
 
     *str1 = MPIU_Strdup(str);
     for (i = 0; (*str1)[i] && ((*str1)[i] != '='); i++);