- Clean up the unreferenced variables.

- Change the arguments for launch failed function according to changeset r18611.

This commit was SVN r18795.

The following SVN revision numbers were found above:
  r18611 --> open-mpi/ompi@7bee71aa59

orte/mca/plm/ccp/plm_ccp_module.c

@@ -95,6 +95,13 @@ orte_plm_base_module_t orte_plm_ccp_module = {
     plm_ccp_finalize
 };
 
+
+/*
+ * Local variables
+ */
+static orte_jobid_t active_job = ORTE_JOBID_INVALID;
+
+
 /**
 * Init the module
  */
@@ -118,12 +125,9 @@ static int plm_ccp_launch_job(orte_job_t *jdata)
     orte_app_context_t **apps;
     orte_node_t **nodes;
     orte_std_cntr_t launched = 0, i; 
-    int local_err;
 
     orte_job_map_t *map = NULL;
-    opal_list_item_t *item;
+    int argc, rc, node_name_index, proc_name_index;
-    size_t num_nodes;
-    int argc, rc, node_name_index, proc_vpid_index, proc_name_index;
     char *param, **env = NULL, *var, **argv = NULL;
     bool connected = false;
     char *bin_base = NULL, *lib_base = NULL, *command_line;
@@ -147,6 +151,11 @@ static int plm_ccp_launch_job(orte_job_t *jdata)
     ITask* pTask = NULL;
     JobPriority job_priority = JobPriority_Normal;
 
+ 	orte_jobid_t failed_job; 
+
+ 	/* default to declaring the daemon launch failed */ 
+ 	failed_job = ORTE_PROC_MY_NAME->jobid; 
+
     /* check for timing request - get start time if so */
     if (orte_timing) {
         if (0 != gettimeofday(&jobstart, NULL)) {
@@ -319,7 +328,6 @@ GETMAP:
         /* Iterate through each of the nodes and check to sum up all the processors. */
         for (i = 0; i < map->num_nodes; i++) {
             orte_node_t* node = nodes[i];
-            char* vpid_string;
 
             BSTR node_name;
             hr = pNode->get_Name(&node_name);
@@ -499,6 +507,8 @@ GETMAP:
     }
 
 launch_apps:
+    /* if we get here, then daemons launched - change to declaring apps failed */ 
+ 	failed_job = active_job; 
     if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(jdata->jobid))) {
         OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,
                              "%s plm:ccp: launch of apps failed for job %s on error %s",
@@ -555,7 +565,7 @@ launch_apps:
 
     /* check for failed launch - if so, force terminate */
     if (failed_launch) {
-        orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START);
+        orte_plm_base_launch_failed(failed_job, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START);
     }
         
     /* check for timing request - get stop time and process if so */