d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup printf arguments for 64-bit machines

Browse Source
This commit is contained in:
Sam Leffler 2004-12-08 22:34:07 +00:00
parent d49a36b1d5
commit 1657488232
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=138609
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net80211/ieee80211_crypto_tkip.c
View File

@ -614,7 +614,7 @@ wep_encrypt(u8 *key, struct mbuf *m0, u_int off, size_t data_len,
m = m->m_next;
if (m == NULL) {
KASSERT(data_len == 0,
("out of buffers with data_len %u\n", data_len));
("out of buffers with data_len %zu\n", data_len));
break;
}
pos = mtod(m, uint8_t *);
@ -672,7 +672,7 @@ wep_decrypt(u8 *key, struct mbuf *m, u_int off, size_t data_len)
m = m->m_next;
if (m == NULL) {
KASSERT(data_len == 0,
("out of buffers with data_len %u\n", data_len));
("out of buffers with data_len %zu\n", data_len));
break;
}
pos = mtod(m, uint8_t *);
@ -824,7 +824,7 @@ michael_mic(struct tkip_ctx *ctx, const u8 *key,
break;
m = m->m_next;
if (m == NULL) {
KASSERT(0, ("out of data, data_len %u\n", data_len));
KASSERT(0, ("out of data, data_len %zu\n", data_len));
break;
}
if (space != 0) {
@ -835,7 +835,7 @@ michael_mic(struct tkip_ctx *ctx, const u8 *key,
data_next = mtod(m, const uint8_t *);
KASSERT(m->m_len >= sizeof(uint32_t) - space,
("not enough data in following buffer, "
"m_len %u need %u\n", m->m_len,
"m_len %u need %zu\n", m->m_len,
sizeof(uint32_t) - space));
switch (space) {
case 1:

4
sys/net80211/ieee80211_crypto_wep.c
View File

@ -354,7 +354,7 @@ wep_encrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen)
if (data_len != 0) { /* out of data */
IEEE80211_DPRINTF(ctx->wc_ic,
IEEE80211_MSG_CRYPTO,
"[%s] out of data for WEP (data_len %u)\n",
"[%s] out of data for WEP (data_len %zu)\n",
ether_sprintf(mtod(m0,
struct ieee80211_frame *)->i_addr2),
data_len);
@ -438,7 +438,7 @@ wep_decrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen)
if (data_len != 0) { /* out of data */
IEEE80211_DPRINTF(ctx->wc_ic,
IEEE80211_MSG_CRYPTO,
"[%s] out of data for WEP (data_len %u)\n",
"[%s] out of data for WEP (data_len %zu)\n",
ether_sprintf(mtod(m0,
struct ieee80211_frame *)->i_addr2),
data_len);

4
sys/net80211/ieee80211_freebsd.c
View File

@ -258,9 +258,9 @@ ieee80211_notify_replay_failure(struct ieee80211com *ic,
struct ifnet *ifp = ic->ic_ifp;
IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO,
"[%s] %s replay detected <rsc %llu, csc %llu>\n",
"[%s] %s replay detected <rsc %ju, csc %ju>\n",
ether_sprintf(wh->i_addr2), k->wk_cipher->ic_name,
rsc, k->wk_keyrsc);
(intmax_t) rsc, (intmax_t) k->wk_keyrsc);
if (ifp != NULL) { /* NB: for cipher test modules */
struct ieee80211_replay_event iev;

6
sys/net80211/ieee80211_output.c
View File

@ -239,7 +239,7 @@ ieee80211_mbuf_adjust(struct ieee80211com *ic, int hdrsize,
return NULL;
}
KASSERT(needed_space <= MHLEN,
("not enough room, need %u got %u\n", needed_space, MHLEN));
("not enough room, need %u got %zu\n", needed_space, MHLEN));
/*
* Setup new mbuf to have leading space to prepend the
* 802.11 header and any crypto header bits that are
@ -712,7 +712,7 @@ ieee80211_setup_wpa_ie(struct ieee80211com *ic, u_int8_t *ie)
/* calculate element length */
ie[1] = frm - ie - 2;
KASSERT(ie[1]+2 <= sizeof(struct ieee80211_ie_wpa),
("WPA IE too big, %u > %u",
("WPA IE too big, %u > %zu",
ie[1]+2, sizeof(struct ieee80211_ie_wpa)));
return frm;
#undef ADDSHORT
@ -796,7 +796,7 @@ ieee80211_setup_rsn_ie(struct ieee80211com *ic, u_int8_t *ie)
/* calculate element length */
ie[1] = frm - ie - 2;
KASSERT(ie[1]+2 <= sizeof(struct ieee80211_ie_wpa),
("RSN IE too big, %u > %u",
("RSN IE too big, %u > %zu",
ie[1]+2, sizeof(struct ieee80211_ie_wpa)));
return frm;
#undef ADDSELECTOR