Fix some set-but-not-used compiler warnings.

cmr=v1.8:reviewer=miked

This commit was SVN r31061.

oshmem/mca/scoll/mpi/scoll_mpi_module.c

@@ -1,5 +1,6 @@
 /**
   Copyright (c) 2011 Mellanox Technologies. All rights reserved.
+  Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
   $COPYRIGHT$
 
   Additional copyrights may follow
@@ -111,7 +112,13 @@ mca_scoll_mpi_comm_query(oshmem_group_t *osh_group, int *priority)
         osh_group->ompi_comm = &(ompi_mpi_comm_world.comm);
     } else {
         err = ompi_comm_group(&(ompi_mpi_comm_world.comm), &parent_group);
+        if (OPAL_UNLIKELY(OMPI_SUCCESS != err)) {
+            return NULL;
+        }
         ranks = (int*) malloc(osh_group->proc_count * sizeof(int));
+        if (OPAL_UNLIKELY(NULL == ranks)) {
+            return NULL;
+        }
         tag = 1;
 
         for (i = 0; i < osh_group->proc_count; i++) {
@@ -119,8 +126,21 @@ mca_scoll_mpi_comm_query(oshmem_group_t *osh_group, int *priority)
         }
 
         err = ompi_group_incl(parent_group, osh_group->proc_count, ranks, &new_group);
+        if (OPAL_UNLIKELY(OMPI_SUCCESS != err)) {
+            free(ranks);
+            return NULL;
+        }
         err = ompi_comm_create_group(&(ompi_mpi_comm_world.comm), new_group, tag, &newcomm);
+        if (OPAL_UNLIKELY(OMPI_SUCCESS != err)) {
+            free(ranks);
+            return NULL;
+        }
         err = ompi_group_free(&new_group);
+        if (OPAL_UNLIKELY(OMPI_SUCCESS != err)) {
+            free(ranks);
+            return NULL;
+        }
+
         free(ranks);
         osh_group->ompi_comm = newcomm;
     }

oshmem/mca/sshmem/mmap/sshmem_mmap_component.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2014      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -93,19 +94,16 @@ mmap_runtime_query(mca_base_module_t **module,
 static int
 mmap_register(void)
 {
-    int ret;
-
-
     /* ////////////////////////////////////////////////////////////////////// */
     /* (default) priority - set high to make mmap the default */
     mca_sshmem_mmap_component.priority = 20;
-    ret = mca_base_component_var_register (&mca_sshmem_mmap_component.super.base_version,
-                                           "priority", "Priority for sshmem mmap "
-                                           "component (default: 20)", MCA_BASE_VAR_TYPE_INT,
-                                           NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
-                                           OPAL_INFO_LVL_3,
-                                           MCA_BASE_VAR_SCOPE_ALL_EQ,
-                                           &mca_sshmem_mmap_component.priority);
+    mca_base_component_var_register (&mca_sshmem_mmap_component.super.base_version,
+                                     "priority", "Priority for sshmem mmap "
+                                     "component (default: 20)", MCA_BASE_VAR_TYPE_INT,
+                                     NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
+                                     OPAL_INFO_LVL_3,
+                                     MCA_BASE_VAR_SCOPE_ALL_EQ,
+                                     &mca_sshmem_mmap_component.priority);
 
     return OSHMEM_SUCCESS;
 }