From: Sean Farley <sean.michael.farley@gmail.com>
Date: Tue, 8 Oct 2013 23:23:11 +0000 (+0800)
Subject: vpatch: change find_line to a macro for proper c
X-Git-Tag: v1.1~9^2~2
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=e010f2ffa78b0e50eff5a9e664f9de27bb790035;p=wiggle.git

vpatch: change find_line to a macro for proper c
---

diff --git a/vpatch.c b/vpatch.c
index 2fbeb7b..c965af1 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -1379,18 +1379,19 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace,
 		free(ci.merger); \
 	} while(0)
 
-	void find_line(int ln)
-	{
-		pos.p.m = 0; /* merge node */
-		pos.p.s = 0; /* stream number */
-		pos.p.o = -1; /* offset */
-		pos.p.lineno = 1;
-		pos.state = 0;
-		memset(&curs, 0, sizeof(curs));
-		do
-			next_mline(&pos, fm, fb, fa, ci.merger, mode);
-		while (pos.p.lineno < ln && ci.merger[pos.p.m].type != End);
-	}
+	#define find_line(ln) \
+	do { \
+		pos.p.m = 0; /* merge node */ \
+		pos.p.s = 0; /* stream number */ \
+		pos.p.o = -1; /* offset */ \
+		pos.p.lineno = 1; \
+		pos.state = 0; \
+		memset(&curs, 0, sizeof(curs)); \
+		do \
+			next_mline(&pos, fm, fb, fa, ci.merger, mode); \
+		while (pos.p.lineno < ln && ci.merger[pos.p.m].type != End); \
+	} while(0)
+
 	void prepare_merge(int ch)
 	{
 		/* FIXME check for errors in the stream */