From c01083a28d592bb0d9edf0ecc9f3f93fdc65ebc0 Mon Sep 17 00:00:00 2001
From: fanf <fanf@FreeBSD.org>
Date: Tue, 10 Sep 2002 21:14:14 +0000
Subject: Fix style bugs in macros.

---
 usr.bin/uudecode/uudecode.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'usr.bin/uudecode/uudecode.c')

diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 9235892..e23dfd7 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -252,16 +252,13 @@ decode2(void)
 		}
 
 #define	DEC(c)	(((c) - ' ') & 077)		/* single character decode */
-#define IS_DEC(c) ( (((c) - ' ') >= 0) &&  (((c) - ' ') <= 077 + 1) )
-/* #define IS_DEC(c) (1) */
+#define IS_DEC(c) ( (((c) - ' ') >= 0) && (((c) - ' ') <= 077 + 1) )
 
-#define OUT_OF_RANGE \
-{	\
-    warnx( \
-"\n\tinput file: %s\n\tencoded file: %s\n\tcharacter out of range: [%d-%d]", \
- 	filename, buffn, 1 + ' ', 077 + ' ' + 1); \
-        return (1); \
-}
+#define OUT_OF_RANGE do {						\
+	warnx("%s: %s: character out of range: [%d-%d]",		\
+	    filename, buffn, 1 + ' ', 077 + ' ' + 1);			\
+        return (1);							\
+} while (0)
 
 		/*
 		 * `n' is used to avoid writing out all the characters
-- 
cgit v1.1