summaryrefslogtreecommitdiffstats
path: root/sys/netkey
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2003-11-02 12:28:04 +0000
committerume <ume@FreeBSD.org>2003-11-02 12:28:04 +0000
commitf4d1f7a456cee0bdcd4ebf8c8faec1a5f2c8c0a8 (patch)
treeda726f9fb6a8958a9b760b858c6b5e7f946784cb /sys/netkey
parent5079f19ffa944d0b068f8b9441fa883ba92b610d (diff)
downloadFreeBSD-src-f4d1f7a456cee0bdcd4ebf8c8faec1a5f2c8c0a8.zip
FreeBSD-src-f4d1f7a456cee0bdcd4ebf8c8faec1a5f2c8c0a8.tar.gz
correct %d/%u mismatch.
Obtained from: KAME
Diffstat (limited to 'sys/netkey')
-rw-r--r--sys/netkey/key.c14
-rw-r--r--sys/netkey/key_debug.c8
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index c91febe..c2cf71a 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -289,7 +289,7 @@ do {\
#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; \
} \
@@ -298,7 +298,7 @@ do { \
#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))); \
} \
@@ -578,7 +578,7 @@ key_gettunnel(osrc, odst, isrc, idst)
struct secpolicyindex spidx;
if (isrc->sa_family != idst->sa_family) {
- ipseclog((LOG_ERR, "protocol family mismatched %d != %d\n.",
+ ipseclog((LOG_ERR, "protocol family mismatched %u != %u\n",
isrc->sa_family, idst->sa_family));
return NULL;
}
@@ -1495,7 +1495,7 @@ key_msg2sp(xpl0, len, error)
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;
@@ -3280,7 +3280,7 @@ key_mature(sav)
algo = ah_algorithm_lookup(sav->alg_auth);
if (!algo) {
- ipseclog((LOG_DEBUG,"key_mature: "
+ ipseclog((LOG_DEBUG, "key_mature: "
"unknown authentication algorithm.\n"));
return EINVAL;
}
@@ -4353,7 +4353,7 @@ key_timehandler(void)
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));
}
@@ -5375,7 +5375,7 @@ key_delete_all(so, m, mhp, proto)
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 --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c
index 18fe067..35ed02f 100644
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@@ -328,7 +328,7 @@ kdebug_sadb_identity(ext)
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
@@ -372,7 +372,7 @@ kdebug_sadb_supported(ext)
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++;
@@ -458,7 +458,7 @@ kdebug_sadb_key(ext)
/* 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));
}
@@ -595,7 +595,7 @@ kdebug_secpolicy(sp)
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;
}
OpenPOWER on IntegriCloud