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): use proper return type for For_Accum



details:   https://anonhg.NetBSD.org/src/rev/8473090d9d0f
branches:  trunk
changeset: 943849:8473090d9d0f
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Sep 12 10:14:16 2020 +0000

description:
make(1): use proper return type for For_Accum

diffstat:

 usr.bin/make/for.c     |  14 +++++++-------
 usr.bin/make/nonints.h |   4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 077552c73346 -r 8473090d9d0f usr.bin/make/for.c
--- a/usr.bin/make/for.c        Sat Sep 12 10:12:09 2020 +0000
+++ b/usr.bin/make/for.c        Sat Sep 12 10:14:16 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: for.c,v 1.80 2020/09/12 10:12:09 rillig Exp $  */
+/*     $NetBSD: for.c,v 1.81 2020/09/12 10:14:16 rillig Exp $  */
 
 /*
  * Copyright (c) 1992, The Regents of the University of California.
@@ -30,14 +30,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: for.c,v 1.80 2020/09/12 10:12:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.81 2020/09/12 10:14:16 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)for.c      8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: for.c,v 1.80 2020/09/12 10:12:09 rillig Exp $");
+__RCSID("$NetBSD: for.c,v 1.81 2020/09/12 10:14:16 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -266,9 +266,9 @@
 
 /*
  * Add another line to a .for loop.
- * Returns 0 when the matching .endfor is reached.
+ * Returns FALSE when the matching .endfor is reached.
  */
-int
+Boolean
 For_Accum(const char *line)
 {
     const char *ptr = line;
@@ -282,7 +282,7 @@
            if (DEBUG(FOR))
                (void)fprintf(debug_file, "For: end for %d\n", forLevel);
            if (--forLevel <= 0)
-               return 0;
+               return FALSE;
        } else if (strncmp(ptr, "for", 3) == 0 && ch_isspace(ptr[3])) {
            forLevel++;
            if (DEBUG(FOR))
@@ -292,7 +292,7 @@
 
     Buf_AddStr(&accumFor->buf, line);
     Buf_AddByte(&accumFor->buf, '\n');
-    return 1;
+    return TRUE;
 }
 
 
diff -r 077552c73346 -r 8473090d9d0f usr.bin/make/nonints.h
--- a/usr.bin/make/nonints.h    Sat Sep 12 10:12:09 2020 +0000
+++ b/usr.bin/make/nonints.h    Sat Sep 12 10:14:16 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nonints.h,v 1.106 2020/09/06 19:34:36 rillig Exp $     */
+/*     $NetBSD: nonints.h,v 1.107 2020/09/12 10:14:16 rillig Exp $     */
 
 /*-
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -99,7 +99,7 @@
 
 /* for.c */
 int For_Eval(const char *);
-int For_Accum(const char *);
+Boolean For_Accum(const char *);
 void For_Run(int);
 
 /* job.c */



Home | Main Index | Thread Index | Old Index