[mpich2-commits] r5449 - in mpich2/trunk/src/pm/hydra: ui/mpiexec utils/bind/plpa utils/dbg utils/launch

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-12 16:48:10 -0500 (Mon, 12 Oct 2009)
New Revision: 5449

Modified:
   mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
   mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c
   mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c
   mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c
   mpich2/trunk/src/pm/hydra/utils/launch/allocate.c
Log:
Warning squashes from a strict compile.

Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c	2009-10-12 19:36:55 UTC (rev 5448)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/mpiexec.c	2009-10-12 21:48:10 UTC (rev 5449)
@@ -141,7 +141,7 @@
 
         if (HYD_handle.proxy_list == NULL) {
             /* The RMK didn't give us anything back; use localhost */
-            status = HYD_UII_mpx_init_proxy_list("localhost", 1);
+            status = HYD_UII_mpx_init_proxy_list((char *) "localhost", 1);
             HYDU_ERR_POP(status, "unable to initialize proxy\n");
         }
     }

Modified: mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c	2009-10-12 19:36:55 UTC (rev 5448)
+++ mpich2/trunk/src/pm/hydra/ui/mpiexec/utils.c	2009-10-12 21:48:10 UTC (rev 5449)
@@ -260,7 +260,7 @@
         HYDU_ERR_POP(status, "error parsing hostfile\n");
     }
     else {
-        status = HYD_UII_mpx_init_proxy_list("localhost", 1);
+        status = HYD_UII_mpx_init_proxy_list((char *) "localhost", 1);
         HYDU_ERR_POP(status, "unable to initialize proxy\n");
     }
 

Modified: mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c	2009-10-12 19:36:55 UTC (rev 5448)
+++ mpich2/trunk/src/pm/hydra/utils/bind/plpa/bind_plpa.c	2009-10-12 21:48:10 UTC (rev 5449)
@@ -18,7 +18,6 @@
     PLPA_NAME(api_type_t) p;
     int ret, i, j, max, id;
     int processor, sock, core, thread;
-    char *str;
     HYD_Status status = HYD_SUCCESS;
 
     HYDU_FUNC_ENTER();

Modified: mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c	2009-10-12 19:36:55 UTC (rev 5448)
+++ mpich2/trunk/src/pm/hydra/utils/dbg/dbg.c	2009-10-12 21:48:10 UTC (rev 5449)
@@ -6,7 +6,7 @@
 
 #include "hydra_utils.h"
 
-static char *dbg_prefix = "unknown";
+static char *dbg_prefix = (char *) "unknown";
 
 void HYDU_dump_prefix(FILE *fp)
 {

Modified: mpich2/trunk/src/pm/hydra/utils/launch/allocate.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/launch/allocate.c	2009-10-12 19:36:55 UTC (rev 5448)
+++ mpich2/trunk/src/pm/hydra/utils/launch/allocate.c	2009-10-12 21:48:10 UTC (rev 5449)
@@ -213,51 +213,6 @@
 }
 
 
-static int count_elements(char *str, const char *delim)
-{
-    int count;
-
-    HYDU_FUNC_ENTER();
-
-    strtok(str, delim);
-    count = 1;
-    while (strtok(NULL, delim))
-        count++;
-
-    HYDU_FUNC_EXIT();
-
-    return count;
-}
-
-
-static char *pad_string(char *str, const char *pad, int count)
-{
-    char *tmp[HYD_NUM_TMP_STRINGS], *out;
-    int i, j;
-    HYD_Status status = HYD_SUCCESS;
-
-    HYDU_FUNC_ENTER();
-
-    i = 0;
-    tmp[i++] = HYDU_strdup(str);
-    for (j = 0; j < count; j++)
-        tmp[i++] = HYDU_strdup(pad);
-    tmp[i] = NULL;
-
-    status = HYDU_str_alloc_and_join(tmp, &out);
-    HYDU_ERR_POP(status, "unable to join strings\n");
-
-    HYDU_free_strlist(tmp);
-
-  fn_exit:
-    HYDU_FUNC_EXIT();
-    return out;
-
-  fn_fail:
-    goto fn_exit;
-}
-
-
 HYD_Status HYDU_alloc_proxy_exec(struct HYD_Proxy_exec **exec)
 {
     HYD_Status status = HYD_SUCCESS;