Cleanup a few warnings about initializing variables.

Remove an obsolete data value.

This commit was SVN r18129.

orte/mca/ess/singleton/ess_singleton_module.c

@@ -326,9 +326,6 @@ static int fork_hnp(void)
         /* likewise, since this is also the HNP, set that uri too */
         orte_process_info.my_hnp_uri = strdup(orted_uri);
         
-        /* update the #daemons in the job since there now is one! */
-        orte_process_info.num_daemons = 1;
-        
        /* indicate we are a singleton so orte_init knows what to do */
         orte_process_info.singleton = true;
         /* all done - report success */

orte/mca/odls/base/odls_base_default_fns.c

@@ -520,7 +520,6 @@ static int odls_base_default_setup_fork(orte_app_context_t *context,
                                         orte_std_cntr_t num_local_procs,
                                         orte_vpid_t vpid_range,
                                         orte_std_cntr_t total_slots_alloc,
-                                        orte_std_cntr_t num_nodes,
                                         bool oversubscribed, char ***environ_copy)
 {
     int rc;
@@ -635,13 +634,6 @@ static int odls_base_default_setup_fork(orte_app_context_t *context,
     opal_setenv(param, orte_process_info.my_daemon_uri, true, environ_copy);
     free(param);
     
-    /* pass the #daemons to the local proc for collective ops */
-    param = mca_base_param_environ_variable("orte","num","daemons");
-    asprintf(&param2, "%ld", (long)num_nodes);
-    opal_setenv(param, param2, true, environ_copy);
-    free(param);
-    free(param2);
-    
     /* pass the hnp's contact info to the local proc in case it
      * needs it
      */
@@ -801,7 +793,6 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
     bool launch_failed=true;
     opal_buffer_t alert;
     orte_std_cntr_t proc_rank;
-    orte_std_cntr_t num_daemons;
     orte_odls_job_t *jobdat;
     
     /* protect operations involving the global list of children */
@@ -914,15 +905,6 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
         rc = ORTE_ERR_NOT_FOUND;
         goto unlock;
     }
-    if (ORTE_RMAPS_ALL_DAEMONS == jobdat->dp) {
-        num_daemons = orte_process_info.num_procs;
-    } else if (ORTE_RMAPS_ALL_EXCEPT_HNP == jobdat->dp) {
-        num_daemons = orte_process_info.num_procs-1;
-    } else {
-        ORTE_ERROR_LOG(ORTE_ERR_NOT_IMPLEMENTED);
-        rc = ORTE_ERR_NOT_IMPLEMENTED;
-        goto unlock;
-    }
     
     /* setup the environment for each context */
     for (i=0; i < num_apps; i++) {
@@ -930,7 +912,6 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
                                                                num_local_procs,
                                                                vpid_range,
                                                                total_slots_alloc,
-                                                               num_daemons,
                                                                oversubscribed,
                                                                &apps[i]->env))) {
             

orte/mca/rml/base/rml_base_contact.c

@@ -69,7 +69,7 @@ int orte_rml_base_update_contact_info(opal_buffer_t* data)
     char *rml_uri;
     orte_process_name_t name;
     int rc;
-    orte_jobid_t jobid;
+    orte_jobid_t jobid=ORTE_JOBID_INVALID;
 
     /* unpack the data for each entry */
     num_procs = 0;

orte/util/proc_info.c

@@ -41,7 +41,6 @@ ORTE_DECLSPEC orte_proc_info_t orte_process_info = {
     /*  .my_name =              */   {ORTE_JOBID_INVALID, ORTE_VPID_INVALID},
     /*  .my_daemon =            */   {ORTE_JOBID_INVALID, ORTE_VPID_INVALID},
     /*  .my_daemon_uri =        */   NULL,
-    /*  .num_daemons =          */   0,
     /*  .my_hnp =               */   {0, 0},
     /*  .my_hnp_uri =           */   NULL,
     /*  .hnp_pid =              */    0,
@@ -120,11 +119,6 @@ int orte_proc_info(void)
                          (NULL == orte_process_info.my_hnp_uri) ? "NULL" : orte_process_info.my_hnp_uri,
                          (NULL == orte_process_info.my_daemon_uri) ? "NULL" : orte_process_info.my_daemon_uri));
 
-    mca_base_param_reg_int_name("orte", "num_daemons",
-                                "Number of daemons in system",
-                                true, false, -1, &tmp);
-    orte_process_info.num_daemons = tmp;
-
     mca_base_param_reg_int_name("orte", "app_num",
                                 "Index of the app_context that defines this proc",
                                 true, false, -1, &tmp);

orte/util/proc_info.h

@@ -48,7 +48,6 @@ struct orte_proc_info_t {
     orte_process_name_t my_name;        /**< My official process name */
     orte_process_name_t my_daemon;      /**< Name of my local daemon */
     char *my_daemon_uri;                /**< Contact info to local daemon */
-    orte_std_cntr_t num_daemons;        /**< number of active daemons */
     orte_process_name_t my_hnp;         /**< Name of my hnp */
     char *my_hnp_uri;                   /**< Contact info for my hnp */
     pid_t hnp_pid;                      /**< hnp pid - used if singleton */