Module Name: src
Committed By: mrg
Date: Fri Apr 15 20:24:30 UTC 2016
Modified Files:
src/doc [netbsd-7]: CHANGES-7.1
src/libexec/httpd [netbsd-7]: cgi-bozo.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/cgi-bozo.c 1.34
use %zu instead of %lu for size_t.
(ok snj@)
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-7.1
cvs rdiff -u -r1.25.2.4 -r1.25.2.5 src/libexec/httpd/cgi-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.79 src/doc/CHANGES-7.1:1.1.2.80
--- src/doc/CHANGES-7.1:1.1.2.79 Fri Apr 15 19:07:25 2016
+++ src/doc/CHANGES-7.1 Fri Apr 15 20:24:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.79 2016/04/15 19:07:25 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.80 2016/04/15 20:24:30 mrg Exp $
A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
release:
@@ -3783,3 +3783,7 @@ xsrc/external/mit/MesaLib/dist/src/mesa/
library is dlopen/dlclose'd !
[riastradh, ticket #1158]
+libexec/httpd/cgi-bozo.c 1.34
+
+ Fix the build: use %zu instead of %lu for size_t.
+ [mrg, ticket #1141]
Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.25.2.4 src/libexec/httpd/cgi-bozo.c:1.25.2.5
--- src/libexec/httpd/cgi-bozo.c:1.25.2.4 Fri Apr 15 19:01:05 2016
+++ src/libexec/httpd/cgi-bozo.c Fri Apr 15 20:24:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cgi-bozo.c,v 1.25.2.4 2016/04/15 19:01:05 snj Exp $ */
+/* $NetBSD: cgi-bozo.c,v 1.25.2.5 2016/04/15 20:24:30 mrg Exp $ */
/* $eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $ */
@@ -448,11 +448,11 @@ bozo_process_cgi(bozo_httpreq_t *request
&search_string_argc);
}
- debug((httpd, DEBUG_NORMAL, "parse_search_string args no: %lu",
+ debug((httpd, DEBUG_NORMAL, "parse_search_string args no: %zu",
search_string_argc));
for (i = 0; i < search_string_argc; i++) {
debug((httpd, DEBUG_FAT,
- "search_string[%lu]: `%s'", i, search_string_argv[i]));
+ "search_string[%zu]: `%s'", i, search_string_argv[i]));
}
argv = bozomalloc(httpd, sizeof(*argv) * (3 + search_string_argc));
@@ -578,7 +578,7 @@ bozo_process_cgi(bozo_httpreq_t *request
path));
for (i = 0; argv[i] != NULL; i++) {
- debug((httpd, DEBUG_FAT, "bozo_process_cgi: argv[%lu] = `%s'",
+ debug((httpd, DEBUG_FAT, "bozo_process_cgi: argv[%zu] = `%s'",
i, argv[i]));
}
