- Fix some compile issues in r11109

- indent / whitespace cleanup
- don't set --daemon-debug when pls debug is given, as it seems to make
  the daemons abort.

This commit was SVN r11113.

The following SVN revision numbers were found above:
  r11109 --> open-mpi/ompi@da7df6d257

orte/mca/pls/bproc/pls_bproc.c

@@ -546,10 +546,12 @@ static int orte_pls_bproc_launch_daemons(orte_cellid_t cellid, char *** envp,
     argc = 0;
     opal_argv_append(&argc, &argv, mca_pls_bproc_component.orted);
     /* check for debug flags */
+#if 0
     if (mca_pls_bproc_component.debug) {
          opal_argv_append(&argc, &argv, "--debug");
          opal_argv_append(&argc, &argv, "--debug-daemons");
     }
+#endif 
 
     opal_argv_append(&argc, &argv, "--bootproxy");
     orte_ns.convert_jobid_to_string(&param, jobid);
@@ -662,12 +664,16 @@ cleanup:
     }
     return rc;
 }
-static void orte_pls_bproc_check_node_state(orte_gpr_notify_data_t *notify_data,
+
-                                           void *user_tag) { 
+
+static void
+orte_pls_bproc_check_node_state(orte_gpr_notify_data_t *notify_data,
+                                void *user_tag) 
+{ 
     orte_gpr_value_t **values;
     bool dead_node = false;
     char *dead_node_name; 
-    int i,j;
+    size_t i, j;
     
     printf("inside check node state... \n"); 
     
@@ -714,13 +720,12 @@ static void orte_pls_bproc_check_node_state(orte_gpr_notify_data_t *notify_data,
                  name_idx++) { 
                 char* node_name = (char*) orte_pointer_array_get_item(mca_pls_bproc_component.active_node_names, name_idx);
                 if(strcmp(node_name, dead_node_name) == 0){ 
-	      printf("this dead node %s belongs to us... \n", node_name);
                     /* one of our nodes up and died... */
                     /* not much to do other than die.... */
-	      int ret, exit_status = ORTE_SUCCESS;
+                    int ret = ORTE_SUCCESS;
                     char *segment = NULL;
                     orte_gpr_value_t** seg_values = NULL;
-	      size_t k, l, num_values = 0;
+                    size_t  num_values = 0;
 	      
                     /**********************
                      * Job Info segment
@@ -762,7 +767,10 @@ static void orte_pls_bproc_check_node_state(orte_gpr_notify_data_t *notify_data,
     }
 }
 
-static int orte_pls_bproc_monitor_nodes() {
+
+static int
+orte_pls_bproc_monitor_nodes(void) 
+{
     orte_gpr_subscription_id_t id;
     return orte_gpr.subscribe_1(&id,
                                 NULL,
@@ -775,9 +783,9 @@ static int orte_pls_bproc_monitor_nodes() {
                                 strdup(ORTE_NODE_STATE_KEY),
                                 orte_pls_bproc_check_node_state,
 				NULL);
- 
 }
 
+
 /**
  * Launches the application processes
  * @param cellid         the cellid of the job
@@ -919,7 +927,7 @@ cleanup:
  * @retval error
  */
 int orte_pls_bproc_launch(orte_jobid_t jobid) {
-    opal_list_item_t* item;
+    opal_list_item_t* item, *item2;
     opal_list_t mapping;
     orte_cellid_t cellid;
     orte_rmaps_base_map_t* map;
@@ -994,6 +1002,10 @@ int orte_pls_bproc_launch(orte_jobid_t jobid) {
         }
     }
 
+    if(0 < mca_pls_bproc_component.debug) {
+        opal_output(0, "pls_bproc: --- starting to launch procs ---");
+    }
+
     /* create an array to hold the pointers to the node arrays for each app
      * context. Also, create an array to hold the lengths of the node arrays */
     node_array = malloc(opal_list_get_size(&mapping) * sizeof(int *));