Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make(1): fix inconsistent indentation after #ifdef



details:   https://anonhg.NetBSD.org/src/rev/77e51bc64a76
branches:  trunk
changeset: 942406:77e51bc64a76
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 07 21:26:43 2020 +0000

description:
make(1): fix inconsistent indentation after #ifdef

Combining #ifdef with regular if-then-else calls for trouble.

diffstat:

 usr.bin/make/meta.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 3edfd52fcedd -r 77e51bc64a76 usr.bin/make/meta.c
--- a/usr.bin/make/meta.c       Sat Nov 07 21:24:33 2020 +0000
+++ b/usr.bin/make/meta.c       Sat Nov 07 21:26:43 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.139 2020/11/07 10:16:19 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.140 2020/11/07 21:26:43 rillig Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -860,9 +860,11 @@
            error = x;
        pbm->mon_fd = -1;
        pbm->filemon = NULL;
-    } else
+       return error;
+    }
 #endif
-       fprintf(pbm->mfp, "\n");        /* ensure end with newline */
+
+    fprintf(pbm->mfp, "\n");   /* ensure end with newline */
     return error;
 }
 



Home | Main Index | Thread Index | Old Index