Silence Coverity warnings

490148 490147
490146 372371
488173

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

src/mca/ras/gridengine/ras_gridengine_module.c

@@ -63,22 +63,31 @@ prte_ras_base_module_t prte_ras_gridengine_module = {NULL, prte_ras_gridengine_a
  */
 static int prte_ras_gridengine_allocate(prte_job_t *jdata, pmix_list_t *nodelist)
 {
-    char *pe_hostfile = getenv("PE_HOSTFILE");
-    char *job_id = getenv("JOB_ID");
+    char *pe_hostfile;
+    char *job_id;
     char buf[1024], *tok, *num, *queue, *arch, *ptr;
     int rc;
     FILE *fp;
     prte_node_t *node;
     bool found;
     PRTE_HIDE_UNUSED_PARAMS(jdata);
 
+    pe_hostfile = getenv("PE_HOSTFILE");
+    job_id = getenv("JOB_ID");
+
+    if (NULL == pe_hostfile || NULL == job_id) {
+        return PRTE_ERR_TAKE_NEXT_OPTION;
+    }
+
     /* show the Grid Engine's JOB_ID */
-    if (prte_mca_ras_gridengine_component.show_jobid || prte_mca_ras_gridengine_component.verbose != -1) {
+    if (prte_mca_ras_gridengine_component.show_jobid ||
+        prte_mca_ras_gridengine_component.verbose != -1) {
         pmix_output(0, "ras:gridengine: JOB_ID: %s", job_id);
     }
 
     /* check the PE_HOSTFILE before continuing on */
-    if (!(fp = fopen(pe_hostfile, "r"))) {
+    fp = fopen(pe_hostfile, "r");
+    if (NULL == fp) {
         pmix_show_help("help-ras-gridengine.txt", "cannot-read-pe-hostfile", true, pe_hostfile,
                        strerror(errno));
         rc = PRTE_ERROR;
@@ -129,7 +138,9 @@ static int prte_ras_gridengine_allocate(prte_job_t *jdata, pmix_list_t *nodelist
     } /* finished reading the $PE_HOSTFILE */
 
 cleanup:
-    fclose(fp);
+    if (NULL != fp) {
+        fclose(fp);
+    }
 
     /* in gridengine, if we didn't find anything, then something
      * is wrong. The user may not have indicated this was a parallel

src/mca/rmaps/seq/rmaps_seq.c

@@ -137,9 +137,8 @@ static int prte_rmaps_seq_map(prte_job_t *jdata,
     prte_app_context_t *app;
     int i, n;
     int32_t j;
-    pmix_list_item_t *item;
     prte_node_t *node, *nd;
-    seq_node_t *sq, *save = NULL, *seq;
+    seq_node_t *sq, *save = NULL, *seq, *seq2;
     pmix_rank_t vpid, apprank;
     int32_t num_nodes;
     int rc;
@@ -207,9 +206,6 @@ static int prte_rmaps_seq_map(prte_job_t *jdata,
     /* start at the beginning... */
     vpid = 0;
     jdata->num_procs = 0;
-    if (0 < pmix_list_get_size(&default_seq_list)) {
-        save = (seq_node_t *) pmix_list_get_first(&default_seq_list);
-    }
 
     /* cycle through the app_contexts, mapping them sequentially */
     for (i = 0; i < jdata->apps->size; i++) {
@@ -293,6 +289,9 @@ static int prte_rmaps_seq_map(prte_job_t *jdata,
             goto process;
         }
 
+        /* if we get here, then there were no app-level directives, so try to use the
+         * default hostfile list */
+
         if (0 < pmix_list_get_size(&default_seq_list)) {
             pmix_output_verbose(5, prte_rmaps_base_framework.framework_output,
                                 "mca:rmaps:seq: using default hostfile nodes on app %s", app->app);
@@ -308,18 +307,16 @@ static int prte_rmaps_seq_map(prte_job_t *jdata,
 process:
         /* check for nolocal and remove the head node, if required */
         if (PRTE_GET_MAPPING_DIRECTIVE(map->mapping) & PRTE_MAPPING_NO_USE_LOCAL) {
-            for (item = pmix_list_get_first(seq_list); item != pmix_list_get_end(seq_list);
-                 item = pmix_list_get_next(item)) {
-                seq = (seq_node_t *) item;
+            PMIX_LIST_FOREACH_SAFE(seq, seq2, seq_list, seq_node_t) {
                 /* need to check ifislocal because the name in the
                  * hostfile may not have been FQDN, while name returned
                  * by gethostname may have been (or vice versa)
                  */
                 if (prte_check_host_is_local(seq->hostname)) {
                     pmix_output_verbose(5, prte_rmaps_base_framework.framework_output,
                                         "mca:rmaps:seq: removing head node %s", seq->hostname);
-                    pmix_list_remove_item(seq_list, item);
-                    PMIX_RELEASE(item); /* "un-retain" it */
+                    pmix_list_remove_item(seq_list, &seq->super);
+                    PMIX_RELEASE(seq); /* "un-retain" it */
                 }
             }
         }
@@ -345,7 +342,14 @@ static int prte_rmaps_seq_map(prte_job_t *jdata,
         }
 
         if (seq_list == &default_seq_list) {
-            sq = save;
+            /* we don't want to start in the same place for every app, so take
+             * the next item in the list - if this is the first time we are
+             * using the default list, then start at its beginning */
+            if (NULL == save) {
+                sq = (seq_node_t *) pmix_list_get_first(&default_seq_list);
+            } else {
+                sq = save;
+            }
         } else {
             sq = (seq_node_t *) pmix_list_get_first(seq_list);
         }

src/prted/pmix/pmix_server.c

@@ -1947,7 +1947,7 @@ static void pmix_server_sched(int status, pmix_proc_t *sender,
     pmix_status_t rc = PMIX_SUCCESS;
     uint8_t cmd;
     int32_t cnt;
-    size_t ninfo;
+    size_t ninfo = 0;
     pmix_alloc_directive_t allocdir;
     uint32_t sessionID;
     pmix_info_t *info = NULL;

src/tools/prted/prted.c

@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
     pmix_data_buffer_t pbuf, *wbuf;
     pmix_byte_object_t pbo;
     int8_t flag;
-    char **nonlocal = NULL, *aliases, *personality;
+    char **nonlocal, *aliases, *personality;
     int n;
     pmix_value_t *vptr;
     char **pargv;
@@ -571,6 +571,7 @@ int main(int argc, char *argv[])
     }
 
     /* include any non-loopback aliases for this node */
+    nonlocal = NULL;
     for (n = 0; NULL != prte_process_info.aliases[n]; n++) {
         if (0 != strcmp(prte_process_info.aliases[n], "localhost") &&
             0 != strcmp(prte_process_info.aliases[n], "127.0.0.1") &&