[src/trunk]: src/usr.bin/make make(1): make cond.c ready for WARNS=6, part 2

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ec9bd2490647
branches:  trunk
changeset: 940205:ec9bd2490647
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Oct 05 19:59:07 2020 +0000

description:
make(1): make cond.c ready for WARNS=6, part 2

diffstat:

 usr.bin/make/cond.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 60d94b05ed4c -r ec9bd2490647 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Mon Oct 05 19:56:08 2020 +0000
+++ b/usr.bin/make/cond.c       Mon Oct 05 19:59:07 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.161 2020/10/05 19:56:08 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.162 2020/10/05 19:59:07 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
 #include "dir.h"
 
 /*     "@(#)cond.c     8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: cond.c,v 1.161 2020/10/05 19:56:08 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.162 2020/10/05 19:59:07 rillig Exp $");
 
 /*
  * The parsing of conditional expressions is based on this grammar:
@@ -1213,10 +1213,10 @@
 void
 Cond_restore_depth(unsigned int saved_depth)
 {
-    int open_conds = cond_depth - cond_min_depth;
+    unsigned int open_conds = cond_depth - cond_min_depth;
 
     if (open_conds != 0 || saved_depth > cond_depth) {
-       Parse_Error(PARSE_FATAL, "%d open conditional%s", open_conds,
+       Parse_Error(PARSE_FATAL, "%u open conditional%s", open_conds,
                    open_conds == 1 ? "" : "s");
        cond_depth = cond_min_depth;
     }
@@ -1227,7 +1227,7 @@
 unsigned int
 Cond_save_depth(void)
 {
-    int depth = cond_min_depth;
+    unsigned int depth = cond_min_depth;
 
     cond_min_depth = cond_depth;
     return depth;