From 648ef2ae5cefb06647d01c5956939a2da7e91d7d Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Tue, 6 Sep 2005 03:13:03 +0000 Subject: [PATCH] One of the latest gcc version bark about a variable being use uninitialized. It was kind of right, because the variable was protected by another one ... But with few modifications I get rid of this warning. This commit was SVN r7189. --- .../mca/gpr/proxy/gpr_proxy_deliver_notify_msg.c | 16 +++++++--------- .../gpr_replica_deliver_notify_msg_api.c | 13 ++++++------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/orte/mca/gpr/proxy/gpr_proxy_deliver_notify_msg.c b/orte/mca/gpr/proxy/gpr_proxy_deliver_notify_msg.c index 22b18d18ae..7b43208a56 100755 --- a/orte/mca/gpr/proxy/gpr_proxy_deliver_notify_msg.c +++ b/orte/mca/gpr/proxy/gpr_proxy_deliver_notify_msg.c @@ -46,7 +46,6 @@ int orte_gpr_proxy_deliver_notify_msg(orte_gpr_notify_message_t *msg) orte_gpr_proxy_subscriber_t **subs, *sub; orte_gpr_proxy_trigger_t *trig, **trigs; size_t i, j, k, n; - bool processed; int rc; /* we first have to check if the message is a trigger message - if so, @@ -110,10 +109,9 @@ int orte_gpr_proxy_deliver_notify_msg(orte_gpr_notify_message_t *msg) */ subs = (orte_gpr_proxy_subscriber_t**) (orte_gpr_proxy_globals.subscriptions)->addr; - processed = false; - for (j=0, k=0; !processed && - k < orte_gpr_proxy_globals.num_subs && - j < (orte_gpr_proxy_globals.subscriptions)->size; j++) { + sub = NULL; + for (j=0, k=0; k < orte_gpr_proxy_globals.num_subs && + j < (orte_gpr_proxy_globals.subscriptions)->size; j++) { if (NULL != subs[j]) { k++; if (NULL != data[i]->target) { @@ -121,17 +119,17 @@ int orte_gpr_proxy_deliver_notify_msg(orte_gpr_notify_message_t *msg) if (NULL != subs[j]->name && 0 == strcmp(data[i]->target, subs[j]->name)) { sub = subs[j]; - processed = true; + break; } } else if (data[i]->id == subs[j]->id) { /* otherwise, see if id's match */ sub = subs[j]; - processed = true; + break; } } } - /* get here and not processed => not found, abort */ - if (!processed) { + /* get here and not found => abort */ + if (NULL == sub) { ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND); return ORTE_ERR_NOT_FOUND; } diff --git a/orte/mca/gpr/replica/api_layer/gpr_replica_deliver_notify_msg_api.c b/orte/mca/gpr/replica/api_layer/gpr_replica_deliver_notify_msg_api.c index 20038149e4..61aaf72468 100755 --- a/orte/mca/gpr/replica/api_layer/gpr_replica_deliver_notify_msg_api.c +++ b/orte/mca/gpr/replica/api_layer/gpr_replica_deliver_notify_msg_api.c @@ -93,9 +93,8 @@ int orte_gpr_replica_deliver_notify_msg(orte_gpr_notify_message_t *msg) */ local_subs = (orte_gpr_replica_local_subscriber_t**) (orte_gpr_replica_globals.local_subscriptions)->addr; - processed = false; - for (j=0, k=0; !processed && - k < orte_gpr_replica_globals.num_local_subs && + sub = NULL; + for (j=0, k=0; k < orte_gpr_replica_globals.num_local_subs && j < (orte_gpr_replica_globals.local_subscriptions)->size; j++) { if (NULL != local_subs[j]) { k++; @@ -104,18 +103,18 @@ int orte_gpr_replica_deliver_notify_msg(orte_gpr_notify_message_t *msg) if (NULL != local_subs[j]->name && 0 == strcmp(data[i]->target, local_subs[j]->name)) { sub = local_subs[j]; - processed = true; + break; } } else if (data[i]->id == local_subs[j]->id) { /* otherwise, see if id's match */ sub = local_subs[j]; - processed = true; + break; } } } - /* get here and not processed => not found, abort */ - if (!processed) { + /* get here and not found => abort */ + if (NULL == sub ) { ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND); return ORTE_ERR_NOT_FOUND; }