From 501d1cc4ad5f3b7a0668e95ff4313e9d9f75925d Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Tue, 8 Dec 2009 18:42:22 +0000 Subject: [PATCH] Set default values to avoid using these variables uninitialized. This commit was SVN r22279. --- orte/mca/ess/cm/ess_cm_module.c | 2 +- orte/mca/odls/default/odls_default_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/orte/mca/ess/cm/ess_cm_module.c b/orte/mca/ess/cm/ess_cm_module.c index a834e0a1f5..ed16338455 100644 --- a/orte/mca/ess/cm/ess_cm_module.c +++ b/orte/mca/ess/cm/ess_cm_module.c @@ -173,7 +173,7 @@ error: static int rte_finalize(void) { - int ret; + int ret = ORTE_SUCCESS; if (ORTE_PROC_IS_DAEMON) { if (ORTE_SUCCESS != (ret = orte_ess_base_orted_finalize())) { diff --git a/orte/mca/odls/default/odls_default_module.c b/orte/mca/odls/default/odls_default_module.c index 91815783b9..ebc36883a2 100644 --- a/orte/mca/odls/default/odls_default_module.c +++ b/orte/mca/odls/default/odls_default_module.c @@ -570,7 +570,7 @@ static int odls_default_fork_local_proc(orte_app_context_t* context, } if (orte_odls_globals.bound) { /* if we are bound, use this as an index into our available sockets */ - for (target_socket=0; target_socket < opal_bitmap_size(&orte_odls_globals.sockets) && n < logical_skt; target_socket++) { + for (target_socket=0, n = 0; target_socket < opal_bitmap_size(&orte_odls_globals.sockets) && n < logical_skt; target_socket++) { if (opal_bitmap_is_set_bit(&orte_odls_globals.sockets, target_socket)) { n++; }