[src/trunk]: src/gnu/usr.bin/rcs/lib Revert last change. The extra while loop...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3fbf109baabc
branches:  trunk
changeset: 772559:3fbf109baabc
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Jan 08 13:57:31 2012 +0000

description:
Revert last change. The extra while loop intruced by the macro changes
causes an end-less loop in ci(1) which uses "break" inside one of the
macros.

"/etc/security" will now no longer fill up "/" (or "/var" depending on
file-system layout).

diffstat:

 gnu/usr.bin/rcs/lib/rcsbase.h |  19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r 74f2bc958927 -r 3fbf109baabc gnu/usr.bin/rcs/lib/rcsbase.h
--- a/gnu/usr.bin/rcs/lib/rcsbase.h     Sun Jan 08 04:01:12 2012 +0000
+++ b/gnu/usr.bin/rcs/lib/rcsbase.h     Sun Jan 08 13:57:31 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rcsbase.h,v 1.10 2012/01/06 15:16:03 joerg Exp $       */
+/*     $NetBSD: rcsbase.h,v 1.11 2012/01/08 13:57:31 tron Exp $        */
 
 /* RCS common definitions and data structures */
 
@@ -33,8 +33,13 @@
 
 /*
  * $Log: rcsbase.h,v $
- * Revision 1.10  2012/01/06 15:16:03  joerg
- * Don't use dangling elses.
+ * Revision 1.11  2012/01/08 13:57:31  tron
+ * Revert last change. The extra while loop intruced by the macro changes
+ * causes an end-less loop in ci(1) which uses "break" inside one of the
+ * macros.
+ *
+ * "/etc/security" will now no longer fill up "/" (or "/var" depending on
+ * file-system layout).
  *
  * Revision 1.9  1998/09/14 18:36:07  tv
  * Increase "keylength" to 32, inspired by <prlw1%newn.cam.ac.uk@localhost> in PR
@@ -286,14 +291,14 @@
 #      if maps_memory
 #              define declarecache register Iptr_type ptr, lim
 #              define setupcache(f) (lim = (f)->lim)
-#              define Igeteof_(f,c,s) do { if ((f)->ptr==(f)->lim) s else (c)= *(f)->ptr++; } while(0);
-#              define cachegeteof_(c,s) do { if (ptr==lim) s else (c)= *ptr++; } while(0);
+#              define Igeteof_(f,c,s) if ((f)->ptr==(f)->lim) s else (c)= *(f)->ptr++;
+#              define cachegeteof_(c,s) if (ptr==lim) s else (c)= *ptr++;
 #      else
                int Igetmore P((RILE*));
 #              define declarecache register Iptr_type ptr; register RILE *rRILE
 #              define setupcache(f) (rRILE = (f))
-#              define Igeteof_(f,c,s) do { if ((f)->ptr==(f)->readlim && !Igetmore(f)) s else (c)= *(f)->ptr++; } while (0);
-#              define cachegeteof_(c,s) do { if (ptr==rRILE->readlim && !Igetmore(rRILE)) s else (c)= *ptr++; } } while (0);
+#              define Igeteof_(f,c,s) if ((f)->ptr==(f)->readlim && !Igetmore(f)) s else (c)= *(f)->ptr++;
+#              define cachegeteof_(c,s) if (ptr==rRILE->readlim && !Igetmore(rRILE)) s else (c)= *ptr++;
 #      endif
 #      define uncache(f) ((f)->ptr = ptr)
 #      define cache(f) (ptr = (f)->ptr)