Skip to content

Commit 023936e

Browse files
author
Ralph Castain
committed
Silence coverity warnings
1 parent 83375bc commit 023936e

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

ompi/mca/dpm/orte/dpm_orte.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
1616
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
1717
* reserved.
18-
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved
18+
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved
1919
* Copyright (c) 2014-2015 Research Organization for Information Science
2020
* and Technology (RIST). All rights reserved.
2121
* $COPYRIGHT$
@@ -1281,7 +1281,7 @@ static int parse_port_name(const char *port_name,
12811281
ptr++;
12821282

12831283
/* convert the RML tag */
1284-
sscanf(ptr,"%d", &tag);
1284+
(void)sscanf(ptr,"%d", &tag);
12851285

12861286
/* now split out the second field - the uri of the remote proc */
12871287
if (NULL == (ptr = strchr(tmpstring, '+'))) {

opal/util/net.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Copyright (c) 2007 Los Alamos National Security, LLC. All rights
1313
* reserved.
1414
* Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
15-
* Copyright (c) 2013 Intel, Inc. All rights reserved.
15+
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
1616
* Copyright (c) 2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
@@ -162,7 +162,7 @@ opal_net_init(void)
162162
for( i = 0; i < count; i++ ) {
163163
arg = args[i];
164164

165-
sscanf( arg, "%u.%u.%u.%u/%u", &a, &b, &c, &d, &bits );
165+
(void)sscanf( arg, "%u.%u.%u.%u/%u", &a, &b, &c, &d, &bits );
166166

167167
if( (a > 255) || (b > 255) || (c > 255) ||
168168
(d > 255) || (bits > 32) ) {

orte/mca/oob/tcp/oob_tcp_connection.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,14 +1032,14 @@ static bool tcp_peer_recv_blocking(mca_oob_tcp_peer_t* peer, int sd,
10321032
"%s connect ack received error %s from %s",
10331033
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
10341034
strerror(opal_socket_errno),
1035-
(NULL == peer) ? "UNKNOWN" : ORTE_NAME_PRINT(&(peer->name)));
1035+
ORTE_NAME_PRINT(&(peer->name)));
10361036
return false;
10371037
} else {
10381038
opal_output(0,
10391039
"%s tcp_peer_recv_blocking: "
10401040
"recv() failed for %s: %s (%d)\n",
10411041
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
1042-
(NULL == peer) ? "UNKNOWN" : ORTE_NAME_PRINT(&(peer->name)),
1042+
ORTE_NAME_PRINT(&(peer->name)),
10431043
strerror(opal_socket_errno),
10441044
opal_socket_errno);
10451045
peer->state = MCA_OOB_TCP_FAILED;

orte/mca/plm/base/plm_base_receive.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ void orte_plm_base_recv(int status, orte_process_name_t* sender,
221221
} else {
222222
jdata->bookmark = parent->bookmark;
223223
}
224+
/* provide the parent's last object */
225+
jdata->bkmark_obj = parent->bkmark_obj;
224226
}
225-
/* provide the parent's last object */
226-
jdata->bkmark_obj = parent->bkmark_obj;
227227

228228
/* launch it */
229229
OPAL_OUTPUT_VERBOSE((5, orte_plm_base_framework.framework_output,

orte/mca/ras/simulator/ras_sim_module.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,11 @@ static int allocate(orte_job_t *jdata, opal_list_t *nodes)
302302
if (NULL != node_cnt) {
303303
opal_argv_free(node_cnt);
304304
}
305-
305+
#if OPAL_HAVE_HWLOC
306+
if (NULL != topos) {
307+
opal_argv_free(topos);
308+
}
309+
#endif
306310
return ORTE_SUCCESS;
307311

308312
error_silent:

0 commit comments

Comments
 (0)