CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Aug 23 18:03:35 UTC 2020

Modified Files:
        src/usr.bin/make: str.c

Log Message:
make(1): prepare str.c for WARNS=6

The next step is to make brk_string return size_t instead of int.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/make/str.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.60 src/usr.bin/make/str.c:1.61
--- src/usr.bin/make/str.c:1.60	Tue Aug 11 18:41:46 2020
+++ src/usr.bin/make/str.c	Sun Aug 23 18:03:35 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: str.c,v 1.60 2020/08/11 18:41:46 rillig Exp $	*/
+/*	$NetBSD: str.c,v 1.61 2020/08/23 18:03:35 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: str.c,v 1.60 2020/08/11 18:41:46 rillig Exp $";
+static char rcsid[] = "$NetBSD: str.c,v 1.61 2020/08/23 18:03:35 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char     sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
 #else
-__RCSID("$NetBSD: str.c,v 1.60 2020/08/11 18:41:46 rillig Exp $");
+__RCSID("$NetBSD: str.c,v 1.61 2020/08/23 18:03:35 rillig Exp $");
 #endif
 #endif				/* not lint */
 #endif
@@ -147,9 +147,9 @@ brk_string(const char *str, int *out_wor
 {
 	size_t str_len;
 	char *words_buf;
-	int words_cap;
+	size_t words_cap;
 	char **words;
-	int words_len;
+	size_t words_len;
 	char inquote;
 	char *word_start;
 	char *word_end;
@@ -282,7 +282,7 @@ brk_string(const char *str, int *out_wor
 	}
 done:
 	words[words_len] = NULL;
-	*out_words_len = words_len;
+	*out_words_len = (int)words_len;
 	*out_words_buf = words_buf;
 	return words;
 }