Skip to content

Commit f19bfc0

Browse files
author
Ralph Castain
committed
Silence a bunch of warnings
Unused variables and an errant '&' Signed-off-by: Ralph Castain <[email protected]>
1 parent a87baec commit f19bfc0

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

ompi/runtime/ompi_mpi_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
1818
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
1919
* Copyright (c) 2012-2013 Inria. All rights reserved.
20-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
20+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
2121
* Copyright (c) 2014-2016 Research Organization for Information Science
2222
* and Technology (RIST). All rights reserved.
2323
* Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
@@ -392,7 +392,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
392392
int32_t expected = OMPI_MPI_STATE_NOT_INITIALIZED;
393393
int32_t desired = OMPI_MPI_STATE_INIT_STARTED;
394394
opal_atomic_wmb();
395-
if (!opal_atomic_cmpset_32(&ompi_mpi_state, &expected, desired)) {
395+
if (!opal_atomic_cmpset_32(&ompi_mpi_state, expected, desired)) {
396396
// If we failed to atomically transition ompi_mpi_state from
397397
// NOT_INITIALIZED to INIT_STARTED, then someone else already
398398
// did that, and we should return.

orte/mca/ess/base/ess_base_std_orted.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
1515
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
17+
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
1818
* $COPYRIGHT$
1919
*
2020
* Additional copyrights may follow
@@ -87,8 +87,6 @@ static bool signals_set=false;
8787
static opal_event_t term_handler;
8888
static opal_event_t int_handler;
8989
static opal_event_t epipe_handler;
90-
static opal_event_t sigusr1_handler;
91-
static opal_event_t sigusr2_handler;
9290
char *log_path = NULL;
9391
static void shutdown_signal(int fd, short flags, void *arg);
9492
static void epipe_signal_callback(int fd, short flags, void *arg);

orte/mca/iof/base/iof_base_frame.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* All rights reserved.
1212
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights reserved.
1313
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
14-
* Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
14+
* Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
1515
* Copyright (c) 2015-2018 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* Copyright (c) 2017 IBM Corporation. All rights reserved.
@@ -118,7 +118,7 @@ static int orte_iof_base_close(void)
118118
*/
119119
static int orte_iof_base_open(mca_base_open_flag_t flags)
120120
{
121-
int rc, xmlfd;
121+
int xmlfd;
122122

123123
/* daemons do not need to do this as they do not write out stdout/err */
124124
if (!ORTE_PROC_IS_DAEMON) {

orte/mca/odls/base/odls_base_default_fns.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1515
* All rights reserved.
1616
* Copyright (c) 2011-2017 Cisco Systems, Inc. All rights reserved
17-
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
17+
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
1818
* Copyright (c) 2014 Research Organization for Information Science
1919
* and Technology (RIST). All rights reserved.
2020
* Copyright (c) 2017 Mellanox Technologies Ltd. All rights reserved.
@@ -115,9 +115,7 @@ int orte_odls_base_default_get_add_procs_data(opal_buffer_t *buffer,
115115
void *nptr;
116116
uint32_t key;
117117
char *nidmap;
118-
orte_proc_t *dmn, *proc;
119-
opal_value_t *val = NULL, *kv;
120-
opal_list_t *modex;
118+
orte_proc_t *proc;
121119
int n;
122120

123121
/* get the job data pointer */

0 commit comments

Comments
 (0)