Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src correct %d/%u mismatch. sync w/kame
details: https://anonhg.NetBSD.org/src/rev/3dc9468d4466
branches: trunk
changeset: 533316:3dc9468d4466
user: itojun <itojun%NetBSD.org@localhost>
date: Thu Jun 27 14:39:45 2002 +0000
description:
correct %d/%u mismatch. sync w/kame
diffstat:
lib/libipsec/ipsec_dump_policy.c | 6 +++---
lib/libipsec/pfkey_dump.c | 12 ++++++------
sys/netkey/key.c | 18 +++++++++---------
sys/netkey/key_debug.c | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diffs (189 lines):
diff -r a0256261365f -r 3dc9468d4466 lib/libipsec/ipsec_dump_policy.c
--- a/lib/libipsec/ipsec_dump_policy.c Thu Jun 27 14:25:44 2002 +0000
+++ b/lib/libipsec/ipsec_dump_policy.c Thu Jun 27 14:39:45 2002 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: ipsec_dump_policy.c,v 1.3 2000/06/12 10:40:52 itojun Exp $ */
-/* $KAME: ipsec_dump_policy.c,v 1.11 2000/05/07 05:29:47 itojun Exp $ */
+/* $NetBSD: ipsec_dump_policy.c,v 1.4 2002/06/27 14:39:47 itojun Exp $ */
+/* $KAME: ipsec_dump_policy.c,v 1.12 2001/11/13 12:38:47 jinmei Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -261,7 +261,7 @@
ch = '#';
else
ch = ':';
- snprintf(buf, len, "%s/%s/%s/%s%c%d", proto, mode, abuf, level,
+ snprintf(buf, len, "%s/%s/%s/%s%c%u", proto, mode, abuf, level,
ch, xisr->sadb_x_ipsecrequest_reqid);
}
diff -r a0256261365f -r 3dc9468d4466 lib/libipsec/pfkey_dump.c
--- a/lib/libipsec/pfkey_dump.c Thu Jun 27 14:25:44 2002 +0000
+++ b/lib/libipsec/pfkey_dump.c Thu Jun 27 14:39:45 2002 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: pfkey_dump.c,v 1.10 2002/05/14 11:24:21 itojun Exp $ */
-/* $KAME: pfkey_dump.c,v 1.36 2002/05/13 05:30:08 itojun Exp $ */
+/* $NetBSD: pfkey_dump.c,v 1.11 2002/06/27 14:39:47 itojun Exp $ */
+/* $KAME: pfkey_dump.c,v 1.37 2002/05/14 10:50:56 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -56,9 +56,9 @@
do { \
if (sizeof((str)[0]) == 0 \
|| num >= sizeof(str)/sizeof((str)[0])) \
- printf("%d ", (num)); \
+ printf("%u ", (num)); \
else if (strlen((str)[(num)]) == 0) \
- printf("%d ", (num)); \
+ printf("%u ", (num)); \
else \
printf("%s ", (str)[(num)]); \
} while (0)
@@ -73,7 +73,7 @@
if (p && p->str) \
printf("%s ", p->str); \
else \
- printf("%d ", (num)); \
+ printf("%u ", (num)); \
} while (0)
static char *str_ipaddr __P((struct sockaddr *));
@@ -514,7 +514,7 @@
if (ent)
printf("%s", ent->p_name);
else
- printf("%d", ulp);
+ printf("%u", ulp);
endprotoent();
break;
diff -r a0256261365f -r 3dc9468d4466 sys/netkey/key.c
--- a/sys/netkey/key.c Thu Jun 27 14:25:44 2002 +0000
+++ b/sys/netkey/key.c Thu Jun 27 14:39:45 2002 +0000
@@ -1,5 +1,5 @@
-/* $NetBSD: key.c,v 1.71 2002/06/14 14:47:25 itojun Exp $ */
-/* $KAME: key.c,v 1.234 2002/05/13 03:21:17 itojun Exp $ */
+/* $NetBSD: key.c,v 1.72 2002/06/27 14:39:45 itojun Exp $ */
+/* $KAME: key.c,v 1.249 2002/06/14 14:46:22 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.71 2002/06/14 14:47:25 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.72 2002/06/27 14:39:45 itojun Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -227,7 +227,7 @@
#define KEY_CHKSASTATE(head, sav, name) \
do { \
if ((head) != (sav)) { \
- ipseclog((LOG_DEBUG, "%s: state mismatched (TREE=%d SA=%d)\n", \
+ ipseclog((LOG_DEBUG, "%s: state mismatched (TREE=%u SA=%u)\n", \
(name), (head), (sav))); \
continue; \
} \
@@ -236,7 +236,7 @@
#define KEY_CHKSPDIR(head, sp, name) \
do { \
if ((head) != (sp)) { \
- ipseclog((LOG_DEBUG, "%s: direction mismatched (TREE=%d SP=%d), " \
+ ipseclog((LOG_DEBUG, "%s: direction mismatched (TREE=%u SP=%u), " \
"anyway continue.\n", \
(name), (head), (sp))); \
} \
@@ -1107,7 +1107,7 @@
if (xisr->sadb_x_ipsecrequest_reqid
> IPSEC_MANUAL_REQID_MAX) {
ipseclog((LOG_DEBUG,
- "key_msg2sp: reqid=%d range "
+ "key_msg2sp: reqid=%u range "
"violation, updated by kernel.\n",
xisr->sadb_x_ipsecrequest_reqid));
xisr->sadb_x_ipsecrequest_reqid = 0;
@@ -2579,7 +2579,7 @@
/* sanity check */
if (sav->state != state) {
ipseclog((LOG_DEBUG, "key_getsavbyspi: "
- "invalid sav->state (queue: %d SA: %d)\n",
+ "invalid sav->state (queue: %u SA: %u)\n",
state, sav->state));
continue;
}
@@ -4114,7 +4114,7 @@
if (sav->state != SADB_SASTATE_DEAD) {
ipseclog((LOG_DEBUG, "key_timehandler: "
"invalid sav->state "
- "(queue: %d SA: %d): "
+ "(queue: %u SA: %u): "
"kill it anyway\n",
SADB_SASTATE_DEAD, sav->state));
}
@@ -5134,7 +5134,7 @@
if (sav->state != state) {
ipseclog((LOG_DEBUG, "key_delete_all: "
"invalid sav->state "
- "(queue: %d SA: %d)\n",
+ "(queue: %u SA: %u)\n",
state, sav->state));
continue;
}
diff -r a0256261365f -r 3dc9468d4466 sys/netkey/key_debug.c
--- a/sys/netkey/key_debug.c Thu Jun 27 14:25:44 2002 +0000
+++ b/sys/netkey/key_debug.c Thu Jun 27 14:39:45 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.21 2002/06/12 01:47:37 itojun Exp $ */
+/* $NetBSD: key_debug.c,v 1.22 2002/06/27 14:39:46 itojun Exp $ */
/* $KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.21 2002/06/12 01:47:37 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.22 2002/06/27 14:39:46 itojun Exp $");
#ifdef _KERNEL
#include "opt_inet.h"
@@ -232,7 +232,7 @@
id->sadb_ident_exttype == SADB_EXT_IDENTITY_SRC ? "src" : "dst");
switch (id->sadb_ident_type) {
default:
- printf(" type=%d id=%lu",
+ printf(" type=%u id=%lu",
id->sadb_ident_type, (u_long)id->sadb_ident_id);
if (len) {
#ifdef _KERNEL
@@ -276,7 +276,7 @@
alg = (struct sadb_alg *)(sup + 1);
printf("sadb_sup{\n");
while (len--) {
- printf(" { id=%d ivlen=%d min=%d max=%d }\n",
+ printf(" { id=%u ivlen=%u min=%u max=%u }\n",
alg->sadb_alg_id, alg->sadb_alg_ivlen,
alg->sadb_alg_minbits, alg->sadb_alg_maxbits);
alg++;
@@ -362,7 +362,7 @@
/* sanity check 2 */
if ((key->sadb_key_bits >> 3) >
(PFKEY_UNUNIT64(key->sadb_key_len) - sizeof(struct sadb_key))) {
- printf("kdebug_sadb_key: key length mismatch, bit:%d len:%ld.\n",
+ printf("kdebug_sadb_key: key length mismatch, bit:%u len:%ld.\n",
key->sadb_key_bits >> 3,
(long)PFKEY_UNUNIT64(key->sadb_key_len) - sizeof(struct sadb_key));
}
@@ -500,7 +500,7 @@
printf(" type=entrust }\n");
break;
default:
- printf("kdebug_secpolicy: Invalid policy found. %d\n",
+ printf("kdebug_secpolicy: Invalid policy found. %u\n",
sp->policy);
break;
}
Home |
Main Index |
Thread Index |
Old Index