[PATCH] Rename already used counter var i

Sebastian Spaeth Sebastian at SSpaeth.de
Tue Apr 27 05:57:25 PDT 2010


From: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>

i is already used in a for loop at this point, so using i here again
broke notmuch-reply (it would just hang). Use j instead of i here.

Signed-off-by: Sebastian Spaeth <Sebastian at SSpaeth.de>
---
 Aneesh noticed this bug and provided a fix for it. IMO it warrants a 0.3.1
 release. notmuch-reply hanging indefinitely is not going to make grumpy
 editors happy. Also despite a documentation blurb above the main snippet of
 code, I find it pretty much black magic what is being done here. But then 
 I don't really know C....

 notmuch-reply.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 333e945..fd1de3b 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -317,7 +317,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
     char *domain=NULL;
     char *tld=NULL;
     const char *delim=". \t";
-    size_t i,other_len;
+    size_t i,j,other_len;
 
     const char *to_headers[] = {"Envelope-to", "X-Original-To"};
 
@@ -348,10 +348,10 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
 		free(tohdr);
 		return primary;
 	    }
-	    for (i = 0; i < other_len; i++)
-		if (strcasestr (tohdr, other[i])) {
+	    for (j = 0; j < other_len; j++)
+		if (strcasestr (tohdr, other[j])) {
 		    free(tohdr);
-		    return other[i];
+		    return other[j];
 		}
 	    free(tohdr);
 	}
-- 
1.7.0.4



More information about the notmuch mailing list