Module Name: src
Committed By: sborrill
Date: Mon Mar 5 19:12:08 UTC 2012
Modified Files:
src/dist/pf/sbin/pflogd [netbsd-6]: pflogd.c pflogd.h
src/games/dab [netbsd-6]: algor.cc board.h
src/libexec/httpd [netbsd-6]: dir-index-bozo.c
src/usr.bin/error [netbsd-6]: error.h touch.c
src/usr.bin/ktruss [netbsd-6]: dump.c
src/usr.bin/unifdef [netbsd-6]: unifdef.c
src/usr.sbin/cpuctl/arch [netbsd-6]: i386.c
Log Message:
Pull up the following revisions(s) (requested by joerg in ticket #75):
usr.sbin/cpuctl/arch/i386.c: revision 1.28
usr.bin/unifdef/unifdef.c: revision 1.21
usr.bin/ktruss/dump.c: revision 1.40
usr.bin/error/error.h: revision 1.19
usr.bin/error/touch.c: revision 1.27
libexec/httpd/dir-index-bozo.c: revision 1.14
games/dab/algor.cc: revision 1.5
games/dab/board.h: revision 1.4
dist/pf/sbin/pflogd/pflogd.c: revision 1.9
dist/pf/sbin/pflogd/pflogd.h: revision 1.5
Fix various format string mismatches
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 src/dist/pf/sbin/pflogd/pflogd.c
cvs rdiff -u -r1.4 -r1.4.20.1 src/dist/pf/sbin/pflogd/pflogd.h
cvs rdiff -u -r1.4 -r1.4.22.1 src/games/dab/algor.cc
cvs rdiff -u -r1.3 -r1.3.4.1 src/games/dab/board.h
cvs rdiff -u -r1.13 -r1.13.2.1 src/libexec/httpd/dir-index-bozo.c
cvs rdiff -u -r1.18 -r1.18.4.1 src/usr.bin/error/error.h
cvs rdiff -u -r1.26 -r1.26.6.1 src/usr.bin/error/touch.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/usr.bin/ktruss/dump.c
cvs rdiff -u -r1.20 -r1.20.4.1 src/usr.bin/unifdef/unifdef.c
cvs rdiff -u -r1.27 -r1.27.2.1 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pf/sbin/pflogd/pflogd.c
diff -u src/dist/pf/sbin/pflogd/pflogd.c:1.8 src/dist/pf/sbin/pflogd/pflogd.c:1.8.8.1
--- src/dist/pf/sbin/pflogd/pflogd.c:1.8 Mon Dec 13 01:45:38 2010
+++ src/dist/pf/sbin/pflogd/pflogd.c Mon Mar 5 19:12:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pflogd.c,v 1.8 2010/12/13 01:45:38 christos Exp $ */
+/* $NetBSD: pflogd.c,v 1.8.8.1 2012/03/05 19:12:08 sborrill Exp $ */
/* $OpenBSD: pflogd.c,v 1.45 2007/06/06 14:11:26 henning Exp $ */
/*
@@ -559,7 +559,7 @@ dump_packet(u_char *user, const struct p
#endif
if (len < sizeof(*h) || h->caplen > (size_t)cur_snaplen) {
- logmsg(LOG_NOTICE, "invalid size %u (%u/%u), packet dropped",
+ logmsg(LOG_NOTICE, "invalid size %zu (%u/%u), packet dropped",
len, cur_snaplen, snaplen);
packets_dropped++;
return;
@@ -770,7 +770,7 @@ main(int argc, char **argv)
logmsg(LOG_WARNING, "Reading stats: %s", pcap_geterr(hpcap));
else
logmsg(LOG_NOTICE,
- "%u packets received, %u/%u dropped (kernel/pflogd)",
+ "%u packets received, %u/%ld dropped (kernel/pflogd)",
pstat.ps_recv, pstat.ps_drop, packets_dropped);
pcap_close(hpcap);
Index: src/dist/pf/sbin/pflogd/pflogd.h
diff -u src/dist/pf/sbin/pflogd/pflogd.h:1.4 src/dist/pf/sbin/pflogd/pflogd.h:1.4.20.1
--- src/dist/pf/sbin/pflogd/pflogd.h:1.4 Wed Jun 18 09:06:26 2008
+++ src/dist/pf/sbin/pflogd/pflogd.h Mon Mar 5 19:12:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pflogd.h,v 1.4 2008/06/18 09:06:26 yamt Exp $ */
+/* $NetBSD: pflogd.h,v 1.4.20.1 2012/03/05 19:12:08 sborrill Exp $ */
/* $OpenBSD: pflogd.h,v 1.3 2006/01/15 16:38:04 canacar Exp $ */
/*
@@ -36,7 +36,7 @@
#define PFLOGD_MAXSNAPLEN INT_MAX
#define PFLOGD_BUFSIZE 65536 /* buffer size for incoming packets */
-void logmsg(int priority, const char *message, ...);
+void logmsg(int priority, const char *message, ...) __printflike(2, 3);
/* Privilege separation */
int priv_init(void);
Index: src/games/dab/algor.cc
diff -u src/games/dab/algor.cc:1.4 src/games/dab/algor.cc:1.4.22.1
--- src/games/dab/algor.cc:1.4 Mon Apr 28 20:22:53 2008
+++ src/games/dab/algor.cc Mon Mar 5 19:12:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $ */
+/* $NetBSD: algor.cc,v 1.4.22.1 2012/03/05 19:12:08 sborrill Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
* algor.C: Computer algorithm
*/
#include "defs.h"
-RCSID("$NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $")
+RCSID("$NetBSD: algor.cc,v 1.4.22.1 2012/03/05 19:12:08 sborrill Exp $")
#include "algor.h"
#include "board.h"
@@ -65,7 +65,7 @@ int ALGOR::find_closure(size_t& y, size_
for (dir = BOX::first; dir < BOX::last; dir++)
if (!box.isset(dir))
return 1;
- b.abort("find_closure: 3 sided box[%d,%d] has no free sides",
+ b.abort("find_closure: 3 sided box[%zu,%zu] has no free sides",
y, x);
}
}
@@ -112,7 +112,7 @@ size_t ALGOR::count_closure(size_t& y, s
dir = tdir;
}
if ((mv = b.domove(ty, tx, tdir, getWho())) == -1)
- b.abort("count_closure: Invalid move (%d, %d, %d)", y, x, dir);
+ b.abort("count_closure: Invalid move (%zu, %zu, %d)", y, x, dir);
else
i += mv;
}
@@ -157,7 +157,7 @@ int ALGOR::try_good_turn(BOX& box, size_
{
// Sanity check; we must have a good box
if (box.count() >= 2)
- b.abort("try_good_turn: box[%d,%d] has more than 2 sides occupied",
+ b.abort("try_good_turn: box[%zu,%zu] has more than 2 sides occupied",
y, x);
// Make sure we don't make a closure in an adjacent box.
@@ -203,7 +203,7 @@ int ALGOR::try_bad_turn(BOX& box, size_t
int last)
{
if (4 - box.count() <= last)
- b.abort("try_bad_turn: Called at [%d,%d] for %d with %d",
+ b.abort("try_bad_turn: Called at [%zu,%zu] for %d with %d",
y, x, last, box.count());
for (dir = BOX::first; dir < BOX::last; dir++)
if (!box.isset(dir)) {
@@ -246,7 +246,7 @@ size_t ALGOR::find_min_closure1(size_t&
// Play a bad move that would cause the opponent's closure
if ((mv = nb.domove(ty, tx, tdir, getWho())) != 0)
- b.abort("find_min_closure1: Invalid move %d (%d, %d, %d)", mv,
+ b.abort("find_min_closure1: Invalid move %d (%zu, %zu, %d)", mv,
ty, tx, tdir);
// Count the opponent's closure
Index: src/games/dab/board.h
diff -u src/games/dab/board.h:1.3 src/games/dab/board.h:1.3.4.1
--- src/games/dab/board.h:1.3 Mon Aug 29 20:30:37 2011
+++ src/games/dab/board.h Mon Mar 5 19:12:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: board.h,v 1.3 2011/08/29 20:30:37 joerg Exp $ */
+/* $NetBSD: board.h,v 1.3.4.1 2012/03/05 19:12:08 sborrill Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,8 @@ class BOARD {
void games(size_t i, const PLAYER& p); // Post games
void total(size_t i, const PLAYER& p); // Post totals
void ties(const PLAYER& p); // Post ties
- __dead void abort(const char *s, ...) const; // Algorithm error
+ __printflike(2, 3) __dead
+ void abort(const char *s, ...) const; // Algorithm error
private:
Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.13 src/libexec/httpd/dir-index-bozo.c:1.13.2.1
--- src/libexec/httpd/dir-index-bozo.c:1.13 Fri Nov 18 09:51:31 2011
+++ src/libexec/httpd/dir-index-bozo.c Mon Mar 5 19:12:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dir-index-bozo.c,v 1.13 2011/11/18 09:51:31 mrg Exp $ */
+/* $NetBSD: dir-index-bozo.c,v 1.13.2.1 2012/03/05 19:12:07 sborrill Exp $ */
/* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */
@@ -162,7 +162,7 @@ bozo_dir_index(bozo_httpreq_t *request,
i++;
memset(spacebuf, ' ', (size_t)i);
spacebuf[i] = '\0';
- bozo_printf(httpd, spacebuf);
+ bozo_printf(httpd, "%s", spacebuf);
l += i;
if (nostat)
@@ -180,7 +180,7 @@ bozo_dir_index(bozo_httpreq_t *request,
i++;
memset(spacebuf, ' ', (size_t)i);
spacebuf[i] = '\0';
- bozo_printf(httpd, spacebuf);
+ bozo_printf(httpd, "%s", spacebuf);
bozo_printf(httpd, "%7ukB",
((unsigned)((unsigned)(sb.st_size) >> 10)));
Index: src/usr.bin/error/error.h
diff -u src/usr.bin/error/error.h:1.18 src/usr.bin/error/error.h:1.18.4.1
--- src/usr.bin/error/error.h:1.18 Wed Aug 17 13:11:22 2011
+++ src/usr.bin/error/error.h Mon Mar 5 19:12:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: error.h,v 1.18 2011/08/17 13:11:22 christos Exp $ */
+/* $NetBSD: error.h,v 1.18.4.1 2012/03/05 19:12:07 sborrill Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -114,7 +114,7 @@ extern const char *suffixlist;
extern boolean query;
extern boolean terse;
-int inquire(const char *, ...); /* inquire for yes/no */
+int inquire(const char *, ...) __printflike(1, 2); /* inquire for yes/no */
/*
* codes for inquire() to return
Index: src/usr.bin/error/touch.c
diff -u src/usr.bin/error/touch.c:1.26 src/usr.bin/error/touch.c:1.26.6.1
--- src/usr.bin/error/touch.c:1.26 Tue May 24 12:24:22 2011
+++ src/usr.bin/error/touch.c Mon Mar 5 19:12:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: touch.c,v 1.26 2011/05/24 12:24:22 joerg Exp $ */
+/* $NetBSD: touch.c,v 1.26.6.1 2012/03/05 19:12:07 sborrill Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: touch.c,v 1.26 2011/05/24 12:24:22 joerg Exp $");
+__RCSID("$NetBSD: touch.c,v 1.26.6.1 2012/03/05 19:12:07 sborrill Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -388,10 +388,13 @@ settotouch(const char *name)
int dest = TOSTDOUT;
if (query) {
- switch (inquire(terse
- ? "Touch? "
- : "Do you want to touch file \"%s\"? ",
- name)) {
+ int reply;
+ if (terse)
+ reply = inquire("Touch? ");
+ else
+ reply = inquire("Do you want to touch file \"%s\"? ",
+ name);
+ switch (reply) {
case Q_NO:
case Q_no:
case Q_error:
Index: src/usr.bin/ktruss/dump.c
diff -u src/usr.bin/ktruss/dump.c:1.39 src/usr.bin/ktruss/dump.c:1.39.2.1
--- src/usr.bin/ktruss/dump.c:1.39 Wed Feb 1 05:34:43 2012
+++ src/usr.bin/ktruss/dump.c Mon Mar 5 19:12:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.c,v 1.39 2012/02/01 05:34:43 dholland Exp $ */
+/* $NetBSD: dump.c,v 1.39.2.1 2012/03/05 19:12:07 sborrill Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: dump.c,v 1.39 2012/02/01 05:34:43 dholland Exp $");
+__RCSID("$NetBSD: dump.c,v 1.39.2.1 2012/03/05 19:12:07 sborrill Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -112,7 +112,7 @@ void putpendq(struct ktr_entry *);
void syscallnameprint(int);
void syscallprint(struct ktr_header *);
void sysretprint(struct ktr_header *);
-int wprintf(const char *, ...);
+int wprintf(const char *, ...) __printflike(1, 2);
void *xrealloc(void *, size_t *, size_t);
int
@@ -635,7 +635,7 @@ sysretprint(struct ktr_header *kth)
} else
switch (ktr->ktr_code) {
case SYS_mmap:
- wprintf(" = %p", (long)ret);
+ wprintf(" = %p", (void *)ret);
break;
default:
wprintf(" = %ld", (long)ret);
Index: src/usr.bin/unifdef/unifdef.c
diff -u src/usr.bin/unifdef/unifdef.c:1.20 src/usr.bin/unifdef/unifdef.c:1.20.4.1
--- src/usr.bin/unifdef/unifdef.c:1.20 Fri Sep 16 15:39:30 2011
+++ src/usr.bin/unifdef/unifdef.c Mon Mar 5 19:12:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: unifdef.c,v 1.20 2011/09/16 15:39:30 joerg Exp $ */
+/* $NetBSD: unifdef.c,v 1.20.4.1 2012/03/05 19:12:07 sborrill Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -77,7 +77,7 @@ static const char copyright[] =
#endif
#ifdef __IDSTRING
__IDSTRING(Berkeley, "@(#)unifdef.c 8.1 (Berkeley) 6/6/93");
-__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.20 2011/09/16 15:39:30 joerg Exp $");
+__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.20.4.1 2012/03/05 19:12:07 sborrill Exp $");
__IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.161 2003/07/01 15:32:48 fanf2 Exp $");
#endif
#endif /* not lint */
@@ -241,7 +241,7 @@ static bool keepthis; /* do
static int exitstat; /* program exit status */
static void addsym(bool, bool, char *);
-static void debug(const char *, ...);
+static void debug(const char *, ...) __printflike(1, 2);
__dead static void done(void);
__dead static void error(const char *);
static int findsym(const char *);
@@ -736,26 +736,26 @@ eval_unary(const struct ops *ops, int *v
cp = skipcomment(*cpp);
if (*cp == '!') {
- debug("eval%d !", ops - eval_ops);
+ debug("eval%td !", ops - eval_ops);
cp++;
if (eval_unary(ops, valp, &cp) == LT_IF)
return (LT_IF);
*valp = !*valp;
} else if (*cp == '(') {
cp++;
- debug("eval%d (", ops - eval_ops);
+ debug("eval%td (", ops - eval_ops);
if (eval_table(eval_ops, valp, &cp) == LT_IF)
return (LT_IF);
cp = skipcomment(cp);
if (*cp++ != ')')
return (LT_IF);
} else if (isdigit((unsigned char)*cp)) {
- debug("eval%d number", ops - eval_ops);
+ debug("eval%td number", ops - eval_ops);
*valp = strtol(cp, &ep, 0);
cp = skipsym(cp);
} else if (strncmp(cp, "defined", 7) == 0 && endsym(cp[7])) {
cp = skipcomment(cp+7);
- debug("eval%d defined", ops - eval_ops);
+ debug("eval%td defined", ops - eval_ops);
if (*cp++ != '(')
return (LT_IF);
cp = skipcomment(cp);
@@ -769,7 +769,7 @@ eval_unary(const struct ops *ops, int *v
return (LT_IF);
keepthis = false;
} else if (!endsym(*cp)) {
- debug("eval%d symbol", ops - eval_ops);
+ debug("eval%td symbol", ops - eval_ops);
sym = findsym(cp);
if (sym < 0 || symlist)
return (LT_IF);
@@ -783,12 +783,12 @@ eval_unary(const struct ops *ops, int *v
cp = skipsym(cp);
keepthis = false;
} else {
- debug("eval%d bad expr", ops - eval_ops);
+ debug("eval%td bad expr", ops - eval_ops);
return (LT_IF);
}
*cpp = cp;
- debug("eval%d = %d", ops - eval_ops, *valp);
+ debug("eval%td = %d", ops - eval_ops, *valp);
return (*valp ? LT_TRUE : LT_FALSE);
}
@@ -802,7 +802,7 @@ eval_table(const struct ops *ops, int *v
const char *cp;
int val;
- debug("eval%d", ops - eval_ops);
+ debug("eval%td", ops - eval_ops);
cp = *cpp;
if (ops->inner(ops+1, valp, &cp) == LT_IF)
return (LT_IF);
@@ -814,14 +814,14 @@ eval_table(const struct ops *ops, int *v
if (op->str == NULL)
break;
cp += strlen(op->str);
- debug("eval%d %s", ops - eval_ops, op->str);
+ debug("eval%td %s", ops - eval_ops, op->str);
if (ops->inner(ops+1, &val, &cp) == LT_IF)
return (LT_IF);
*valp = op->fn(*valp, val);
}
*cpp = cp;
- debug("eval%d = %d", ops - eval_ops, *valp);
+ debug("eval%td = %d", ops - eval_ops, *valp);
return (*valp ? LT_TRUE : LT_FALSE);
}
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.27 src/usr.sbin/cpuctl/arch/i386.c:1.27.2.1
--- src/usr.sbin/cpuctl/arch/i386.c:1.27 Fri Feb 3 05:07:17 2012
+++ src/usr.sbin/cpuctl/arch/i386.c Mon Mar 5 19:12:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.27 2012/02/03 05:07:17 yamt Exp $ */
+/* $NetBSD: i386.c,v 1.27.2.1 2012/03/05 19:12:06 sborrill Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.27 2012/02/03 05:07:17 yamt Exp $");
+__RCSID("$NetBSD: i386.c,v 1.27.2.1 2012/03/05 19:12:06 sborrill Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1394,9 +1394,9 @@ identifycpu(const char *cpuname)
aprint_normal("%s: %s", cpuname, cpu_model);
if (ci->ci_tsc_freq != 0)
- aprint_normal(", %qd.%02qd MHz",
- (ci->ci_tsc_freq + 4999) / 1000000,
- ((ci->ci_tsc_freq + 4999) / 10000) % 100);
+ aprint_normal(", %ju.%02ju MHz",
+ ((uintmax_t)ci->ci_tsc_freq + 4999) / 1000000,
+ (((uintmax_t)ci->ci_tsc_freq + 4999) / 10000) % 100);
if (ci->ci_signature != 0)
aprint_normal(", id 0x%x", ci->ci_signature);
aprint_normal("\n");
