[src/netbsd-6-1]: src Pull up following revision(s) (requested by mrg in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/8d6ff8454873
branches:  netbsd-6-1
changeset: 776120:8d6ff8454873
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Apr 15 20:16:24 2016 +0000

description:
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@)

diffstat:

 doc/CHANGES-6.1.6        |  6 +++++-
 libexec/httpd/cgi-bozo.c |  8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 993ffeaed15c -r 8d6ff8454873 doc/CHANGES-6.1.6
--- a/doc/CHANGES-6.1.6 Fri Apr 15 19:37:47 2016 +0000
+++ b/doc/CHANGES-6.1.6 Fri Apr 15 20:16:24 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.58 2016/04/15 19:37:47 snj Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.59 2016/04/15 20:16:24 mrg Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -7511,3 +7511,7 @@
        o -C option supports now CGI scripts only
        [mrg, ticket #1377]
 
+libexec/httpd/cgi-bozo.c                        1.34
+
+       Fix the build: use %zu instead of %lu for size_t.
+       [mrg, ticket #1377]
diff -r 993ffeaed15c -r 8d6ff8454873 libexec/httpd/cgi-bozo.c
--- a/libexec/httpd/cgi-bozo.c  Fri Apr 15 19:37:47 2016 +0000
+++ b/libexec/httpd/cgi-bozo.c  Fri Apr 15 20:16:24 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgi-bozo.c,v 1.20.14.2 2016/04/15 19:37:27 snj Exp $   */
+/*     $NetBSD: cgi-bozo.c,v 1.20.14.3 2016/04/15 20:16:24 mrg Exp $   */
 
 /*     $eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $        */
 
@@ -448,11 +448,11 @@
                    &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 @@
            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]));
        }