Complete the app_idx change by cleaning up warnings in mappers

This commit was SVN r22728.

orte/mca/rmaps/seq/rmaps_seq.c

@@ -58,7 +58,8 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
 {
     orte_job_map_t *map;
     orte_app_context_t *app;
-    orte_std_cntr_t i, j;
+    int i, n;
+    orte_std_cntr_t j;
     opal_list_item_t *item;
     orte_node_t *node, *nd, *save=NULL;
     orte_vpid_t vpid;
@@ -93,7 +94,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
     }
     
     /* cycle through the app_contexts, mapping them sequentially */
-    for(i=0; i < jdata->num_apps; i++) {
+    for(i=0; i < jdata->apps->size; i++) {
         if (NULL == (app = (orte_app_context_t*)opal_pointer_array_get_item(jdata->apps, i))) {
             continue;
         }
@@ -143,7 +144,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
             app->num_procs = num_nodes;
         }
         
-        for (i=0; i < app->num_procs; i++) {
+        for (n=0; n < app->num_procs; n++) {
             /* find this node on the global array - this is necessary so
              * that our mapping gets saved on that array as the objects
              * returned by the hostfile function are -not- on the array

orte/mca/rmaps/topo/rmaps_topo.c

@@ -270,8 +270,8 @@ static int map_app_by_slot(
 static int topo_map(orte_job_t *jdata)
 {
     orte_job_map_t *map;
-    orte_app_context_t *app, **apps;
+    orte_app_context_t *app;
-    orte_std_cntr_t i;
+    int i;
     opal_list_t node_list;
     opal_list_item_t *item;
     orte_node_t *node, *nd1;
@@ -287,7 +287,6 @@ static int topo_map(orte_job_t *jdata)
     
     /* conveniece def */
     map = jdata->map;
-    apps = (orte_app_context_t**)jdata->apps->addr;
     
     /* start at the beginning... */
     vpid_start = 0;
@@ -300,8 +299,10 @@ static int topo_map(orte_job_t *jdata)
     }
     
     /* cycle through the app_contexts, mapping them sequentially */
-    for(i=0; i < jdata->num_apps; i++) {
+    for(i=0; i < jdata->apps->size; i++) {
-        app = apps[i];
+        if (NULL == (app = (orte_app_context_t*)opal_pointer_array_get_item(jdata->apps, i))) {
+            continue;
+        }
 
         /* if the number of processes wasn't specified, then we know there can be only
          * one app_context allowed in the launch, and that we are to launch it across