upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-07-16 04:22:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

MFC

Browse source
This commit is contained in:
Attilio Rao 2011-06-16 10:41:59 +00:00
commit 1e5abc3cb2
5 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libstand/zalloc.c
View file

@ -154,7 +154,7 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes)
if ((char *)ptr < (char *)mp->mp_Base ||
(char *)ptr + bytes > (char *)mp->mp_End ||
((iaddr_t)ptr & MEMNODE_SIZE_MASK) != 0)
panic("zfree(%p,%d): wild pointer", ptr, bytes);
panic("zfree(%p,%ju): wild pointer", ptr, bytes);
/*
* free the segment
@ -178,7 +178,7 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes)
* range check
*/
if ((char *)ptr + bytes > (char *)mn)
panic("zfree(%p,%d): corrupt memlist1",ptr, bytes);
panic("zfree(%p,%ju): corrupt memlist1",ptr, bytes);
/*
* merge against next area or create independant area
@ -209,7 +209,7 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes)
/* NOT REACHED */
}
if ((char *)ptr < (char *)mn + mn->mr_Bytes)
panic("zfree(%p,%d): corrupt memlist2", ptr, bytes);
panic("zfree(%p,%ju): corrupt memlist2", ptr, bytes);
}
/*
* We are beyond the last MemNode, append new MemNode. Merge against

16
sbin/hastd/proto_common.c
View file

@ -194,8 +194,6 @@ int
proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp)
{
ssize_t done;
size_t total_done, recvsize;
unsigned char *dp;
PJDLOG_ASSERT(sock >= 0);
@ -212,19 +210,9 @@ proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp)
PJDLOG_ASSERT(data != NULL);
PJDLOG_ASSERT(size > 0);
total_done = 0;
dp = data;
do {
recvsize = size - total_done;
recvsize = recvsize < MAX_SEND_SIZE ? recvsize : MAX_SEND_SIZE;
done = recv(sock, dp, recvsize, MSG_WAITALL);
if (done == -1 && errno == EINTR)
continue;
if (done <= 0)
break;
total_done += done;
dp += done;
} while (total_done < size);
done = recv(sock, data, size, MSG_WAITALL);
} while (done == -1 && errno == EINTR);
if (done == 0) {
return (ENOTCONN);
} else if (done < 0) {

5
sys/net80211/ieee80211_acl.c
View file

@ -77,7 +77,7 @@ struct acl {
struct aclstate {
acl_lock_t as_lock;
int as_policy;
int as_nacls;
uint32_t as_nacls;
TAILQ_HEAD(, acl) as_list; /* list of all ACL's */
LIST_HEAD(, acl) as_hash[ACL_HASHSIZE];
struct ieee80211vap *as_vap;
@ -289,7 +289,8 @@ acl_getioctl(struct ieee80211vap *vap, struct ieee80211req *ireq)
struct aclstate *as = vap->iv_as;
struct acl *acl;
struct ieee80211req_maclist *ap;
int error, space, i;
int error;
uint32_t i, space;
switch (ireq->i_val) {
case IEEE80211_MACCMD_POLICY:

10
sys/net80211/ieee80211_ioctl.c
View file

@ -143,7 +143,7 @@ static __noinline int
ieee80211_ioctl_getchaninfo(struct ieee80211vap *vap, struct ieee80211req *ireq)
{
struct ieee80211com *ic = vap->iv_ic;
int space;
uint32_t space;
space = __offsetof(struct ieee80211req_chaninfo,
ic_chans[ic->ic_nchans]);
@ -207,7 +207,7 @@ ieee80211_ioctl_getstastats(struct ieee80211vap *vap, struct ieee80211req *ireq)
{
struct ieee80211_node *ni;
uint8_t macaddr[IEEE80211_ADDR_LEN];
const int off = __offsetof(struct ieee80211req_sta_stats, is_stats);
const size_t off = __offsetof(struct ieee80211req_sta_stats, is_stats);
int error;
if (ireq->i_len < off)
@ -323,7 +323,7 @@ ieee80211_ioctl_getscanresults(struct ieee80211vap *vap,
if (req.space > ireq->i_len)
req.space = ireq->i_len;
if (req.space > 0) {
size_t space;
uint32_t space;
void *p;
space = req.space;
@ -458,7 +458,7 @@ get_sta_info(void *arg, struct ieee80211_node *ni)
static __noinline int
getstainfo_common(struct ieee80211vap *vap, struct ieee80211req *ireq,
struct ieee80211_node *ni, int off)
struct ieee80211_node *ni, size_t off)
{
struct ieee80211com *ic = vap->iv_ic;
struct stainforeq req;
@ -503,7 +503,7 @@ static __noinline int
ieee80211_ioctl_getstainfo(struct ieee80211vap *vap, struct ieee80211req *ireq)
{
uint8_t macaddr[IEEE80211_ADDR_LEN];
const int off = __offsetof(struct ieee80211req_sta_req, info);
const size_t off = __offsetof(struct ieee80211req_sta_req, info);
struct ieee80211_node *ni;
int error;

2
sys/net80211/ieee80211_ioctl.h
View file

@ -578,7 +578,7 @@ struct ieee80211req {
char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */
uint16_t i_type; /* req type */
int16_t i_val; /* Index or simple value */
int16_t i_len; /* Index or simple value */
uint16_t i_len; /* Index or simple value */
void *i_data; /* Extra data */
};
#define SIOCS80211 _IOW('i', 234, struct ieee80211req)