write: remove PUTC macro

Function like macros make following the execution flow unnecessarily
difficult, and deserves to be removed.

Requested-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/term-utils/write.c b/term-utils/write.c
index 696a7a7953daa2a1a8a1b5d9685fba7c168aa008..40be5c2de4db53d77c0dc286f800c5cd82f3989e 100644 (file)
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -220,18 +220,13 @@ static void signal_handler(int signo)
  */
 static void write_line(char *s)
 {
-       char c;
-
-#define        PUTC(c) if (fputc_careful(c, stdout, '^') == EOF) \
-    err(EXIT_FAILURE, _("carefulputc failed"));
        while (*s) {
-               c = *s++;
-               if (c == '\n')
-                       PUTC('\r');
-               PUTC(c);
+               const int c = *s++;
+
+               if ((c == '\n' && fputc_careful('\r', stdout, '^') == EOF)
+                   || fputc_careful(c, stdout, '^') == EOF)
+                       err(EXIT_FAILURE, _("carefulputc failed"));
        }
-       return;
-#undef PUTC
 }
 
 /*