[mpich2-commits] r8059 - in mpich2/trunk/src/pm/hydra: include utils/sock utils/string

[balaji at mcs.anl.gov]

Author: balaji
Date: 2011-02-25 23:00:26 -0600 (Fri, 25 Feb 2011)
New Revision: 8059

Modified:
   mpich2/trunk/src/pm/hydra/include/hydra.h
   mpich2/trunk/src/pm/hydra/utils/sock/sock.c
   mpich2/trunk/src/pm/hydra/utils/string/string.c
Log:
Use herror instead of strerror for gethostbyname() errors. Thanks to
Nicolas Rosner for reporting the problem.

Modified: mpich2/trunk/src/pm/hydra/include/hydra.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra.h	2011-02-26 02:50:57 UTC (rev 8058)
+++ mpich2/trunk/src/pm/hydra/include/hydra.h	2011-02-26 05:00:26 UTC (rev 8059)
@@ -586,7 +586,19 @@
 HYD_status HYDU_strdup_list(char *src[], char **dest[]);
 char *HYDU_int_to_str(int x);
 char *HYDU_int_to_str_pad(int x, int maxlen);
-char *HYDU_strerror(int error);
+
+#if defined HAVE_STRERROR
+#define HYDU_strerror strerror
+#else
+#define HYDU_strerror HYDU_int_to_str
+#endif /* HAVE_STRERROR */
+
+#if defined HAVE_HERROR
+#define HYDU_herror herror
+#else
+#define HYDU_herror HYDU_int_to_str
+#endif /* HAVE_HERROR */
+
 int HYDU_strlist_lastidx(char **strlist);
 char **HYDU_str_to_strlist(char *str);
 

Modified: mpich2/trunk/src/pm/hydra/utils/sock/sock.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/sock/sock.c	2011-02-26 02:50:57 UTC (rev 8058)
+++ mpich2/trunk/src/pm/hydra/utils/sock/sock.c	2011-02-26 05:00:26 UTC (rev 8059)
@@ -166,7 +166,7 @@
     ht = gethostbyname(host);
     if (ht == NULL)
         HYDU_ERR_SETANDJUMP(status, HYD_INVALID_PARAM,
-                            "unable to get host address (%s)\n", HYDU_strerror(errno));
+                            "unable to get host address (%s)\n", HYDU_herror(h_errno));
     memcpy(&sa.sin_addr, ht->h_addr_list[0], ht->h_length);
 
     /* Create a socket and set the required options */

Modified: mpich2/trunk/src/pm/hydra/utils/string/string.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/string/string.c	2011-02-26 02:50:57 UTC (rev 8058)
+++ mpich2/trunk/src/pm/hydra/utils/string/string.c	2011-02-26 05:00:26 UTC (rev 8059)
@@ -181,21 +181,6 @@
     goto fn_exit;
 }
 
-
-char *HYDU_strerror(int error)
-{
-    char *str;
-
-#if defined HAVE_STRERROR
-    str = strerror(error);
-#else
-    str = HYDU_strdup("errno: %d", error);
-#endif /* HAVE_STRERROR */
-
-    return str;
-}
-
-
 int HYDU_strlist_lastidx(char **strlist)
 {
     int i;