From 0db0bb377a49f8d4c1499085474d405199bb1e93 Mon Sep 17 00:00:00 2001
From: Tim Woodall <twoodall@lanl.gov>
Date: Wed, 20 Oct 2004 21:41:48 +0000
Subject: [PATCH] fix for waitany

This commit was SVN r3242.
---
 src/request/req_wait.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/request/req_wait.c b/src/request/req_wait.c
index 9818b047ee..8ac3db198f 100644
--- a/src/request/req_wait.c
+++ b/src/request/req_wait.c
@@ -17,7 +17,7 @@ int ompi_request_wait_any(
     int c;
 #endif
     size_t i, null_requests;
-    int rc;
+    int rc = OMPI_SUCCESS;
     int completed = -1;
     ompi_request_t **rptr;
     ompi_request_t *request;
@@ -28,7 +28,7 @@ int ompi_request_wait_any(
     for (c = 0; completed < 0 && c < ompi_request_poll_iterations; c++) {
         rptr = requests;
         null_requests = 0;
-        for (i = 0; i < count; i++) {
+        for (i = 0; i < count; i++, rptr++) {
             request = *rptr;
             if (MPI_REQUEST_NULL == request) {
                 if(++null_requests == count)
@@ -39,7 +39,6 @@ int ompi_request_wait_any(
                 completed = i;
                 goto finished;
             } 
-            rptr++;
         }
     }
 #endif
@@ -50,7 +49,7 @@ int ompi_request_wait_any(
         ompi_request_waiting++;
         rptr = requests;
         null_requests = 0;
-        for (i = 0; i < count; i++) {
+        for (i = 0; i < count; i++, rptr++) {
             request = *rptr;
             if (MPI_REQUEST_NULL == request) {
                 null_requests++;
@@ -60,7 +59,6 @@ int ompi_request_wait_any(
                 completed = i;
                 break;
             }
-            rptr++;
         }
         if(null_requests == count)
             break;
@@ -75,7 +73,6 @@ finished:
 
     if(null_requests == count) {
         *index = MPI_UNDEFINED;
-        *status = ompi_request_null.req_status;
     } else {
 
         /* return status */