From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 19 Jul 2008 19:50:15 +0000 (-0400)
Subject: Simplify getele()
X-Git-Tag: v4.3.16~59
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=052d514bfe049718c8d2a986097dd4125642e792

Simplify getele()

No need to check player->aborted(), checking value of uprmptrd()
suffices.
---

diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c
index ee5ac4b30..5fa442bce 100644
--- a/src/lib/subs/getele.c
+++ b/src/lib/subs/getele.c
@@ -56,7 +56,7 @@ getele(char *recipient, char *buf)
     pr("undo last line with ~u, print with ~p, abort with ~q, end with ^D or .\n");
     bp = buf;
     *bp = 0;
-    while (!player->aborted) {
+    for (;;) {
 	sprintf(left, "%4d left: ", (int)(buf + MAXTELSIZE - bp));
 	if (uprmptrd(left, buffer, sizeof(buffer) - 2) <= 0)
 	    return -1;
@@ -93,8 +93,6 @@ getele(char *recipient, char *buf)
 	    bp += len;
 	}
     }
-    if (player->aborted)
-	return -1;
     return bp - buf;
 }