From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 7 Apr 2011 21:53:21 +0000 (+0200)
Subject: Problem with merge: this is called Buf in stable, not LineBuf
X-Git-Tag: v7.86~1
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3d8a628f35f644af871e19d9b6a2a30fb66d88a7

Problem with merge: this is called Buf in stable, not LineBuf
---

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 5022a0c03..b070030cb 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -114,10 +114,10 @@ void do_generic(void)
 		}
 	case 1:
 		while (!Done) {
-			if (StrBuf_ServGetln(LineBuf) < 0)
+			if (StrBuf_ServGetln(Buf) < 0)
 				break;
-			if ( (StrLength(LineBuf)==3) && 
-			     !strcmp(ChrPtr(LineBuf), "000")) {
+			if ( (StrLength(Buf)==3) && 
+			     !strcmp(ChrPtr(Buf), "000")) {
 				Done = 1;
 			}
 			StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);