Module Name: src
Committed By: tron
Date: Sun Jan 8 13:57:31 UTC 2012
Modified Files:
src/gnu/usr.bin/rcs/lib: rcsbase.h
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/rcs/lib/rcsbase.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/rcs/lib/rcsbase.h
diff -u src/gnu/usr.bin/rcs/lib/rcsbase.h:1.10 src/gnu/usr.bin/rcs/lib/rcsbase.h:1.11
--- src/gnu/usr.bin/rcs/lib/rcsbase.h:1.10 Fri Jan 6 15:16:03 2012
+++ src/gnu/usr.bin/rcs/lib/rcsbase.h Sun Jan 8 13:57:31 2012
@@ -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 @@ Report problems and direct all questions
/*
* $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 <[email protected]> in PR
@@ -286,14 +291,14 @@ Report problems and direct all questions
# 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)
