svn commit: r223146 - in projects/largeSMP: contrib/top
lib/libstand sbin/hastd share/mk sys/net80211
Attilio Rao
attilio at FreeBSD.org
Thu Jun 16 10:42:00 UTC 2011
Author: attilio
Date: Thu Jun 16 10:41:59 2011
New Revision: 223146
URL: http://svn.freebsd.org/changeset/base/223146
Log:
MFC
Modified:
projects/largeSMP/lib/libstand/zalloc.c
projects/largeSMP/sbin/hastd/proto_common.c
projects/largeSMP/sys/net80211/ieee80211_acl.c
projects/largeSMP/sys/net80211/ieee80211_ioctl.c
projects/largeSMP/sys/net80211/ieee80211_ioctl.h
Directory Properties:
projects/largeSMP/ (props changed)
projects/largeSMP/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/contrib/bind9/ (props changed)
projects/largeSMP/contrib/binutils/ (props changed)
projects/largeSMP/contrib/bzip2/ (props changed)
projects/largeSMP/contrib/compiler-rt/ (props changed)
projects/largeSMP/contrib/dialog/ (props changed)
projects/largeSMP/contrib/ee/ (props changed)
projects/largeSMP/contrib/expat/ (props changed)
projects/largeSMP/contrib/file/ (props changed)
projects/largeSMP/contrib/gcc/ (props changed)
projects/largeSMP/contrib/gdb/ (props changed)
projects/largeSMP/contrib/gdtoa/ (props changed)
projects/largeSMP/contrib/gnu-sort/ (props changed)
projects/largeSMP/contrib/groff/ (props changed)
projects/largeSMP/contrib/less/ (props changed)
projects/largeSMP/contrib/libpcap/ (props changed)
projects/largeSMP/contrib/libstdc++/ (props changed)
projects/largeSMP/contrib/llvm/ (props changed)
projects/largeSMP/contrib/llvm/tools/clang/ (props changed)
projects/largeSMP/contrib/ncurses/ (props changed)
projects/largeSMP/contrib/netcat/ (props changed)
projects/largeSMP/contrib/ntp/ (props changed)
projects/largeSMP/contrib/one-true-awk/ (props changed)
projects/largeSMP/contrib/openbsm/ (props changed)
projects/largeSMP/contrib/openpam/ (props changed)
projects/largeSMP/contrib/pf/ (props changed)
projects/largeSMP/contrib/sendmail/ (props changed)
projects/largeSMP/contrib/tcpdump/ (props changed)
projects/largeSMP/contrib/tcsh/ (props changed)
projects/largeSMP/contrib/top/ (props changed)
projects/largeSMP/contrib/top/install-sh (props changed)
projects/largeSMP/contrib/tzcode/stdtime/ (props changed)
projects/largeSMP/contrib/tzcode/zic/ (props changed)
projects/largeSMP/contrib/tzdata/ (props changed)
projects/largeSMP/contrib/wpa/ (props changed)
projects/largeSMP/contrib/xz/ (props changed)
projects/largeSMP/crypto/openssh/ (props changed)
projects/largeSMP/crypto/openssl/ (props changed)
projects/largeSMP/gnu/lib/ (props changed)
projects/largeSMP/gnu/usr.bin/binutils/ (props changed)
projects/largeSMP/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/largeSMP/gnu/usr.bin/gdb/ (props changed)
projects/largeSMP/lib/libc/ (props changed)
projects/largeSMP/lib/libc/stdtime/ (props changed)
projects/largeSMP/lib/libutil/ (props changed)
projects/largeSMP/lib/libz/ (props changed)
projects/largeSMP/sbin/ (props changed)
projects/largeSMP/sbin/ipfw/ (props changed)
projects/largeSMP/share/mk/bsd.arch.inc.mk (props changed)
projects/largeSMP/share/zoneinfo/ (props changed)
projects/largeSMP/sys/ (props changed)
projects/largeSMP/sys/amd64/include/xen/ (props changed)
projects/largeSMP/sys/boot/ (props changed)
projects/largeSMP/sys/boot/i386/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/ski/ (props changed)
projects/largeSMP/sys/boot/powerpc/boot1.chrp/ (props changed)
projects/largeSMP/sys/boot/powerpc/ofw/ (props changed)
projects/largeSMP/sys/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/sys/conf/ (props changed)
projects/largeSMP/sys/contrib/dev/acpica/ (props changed)
projects/largeSMP/sys/contrib/octeon-sdk/ (props changed)
projects/largeSMP/sys/contrib/pf/ (props changed)
projects/largeSMP/sys/contrib/x86emu/ (props changed)
projects/largeSMP/usr.bin/calendar/ (props changed)
projects/largeSMP/usr.bin/csup/ (props changed)
projects/largeSMP/usr.bin/procstat/ (props changed)
projects/largeSMP/usr.sbin/ndiscvt/ (props changed)
projects/largeSMP/usr.sbin/zic/ (props changed)
Modified: projects/largeSMP/lib/libstand/zalloc.c
==============================================================================
--- projects/largeSMP/lib/libstand/zalloc.c Thu Jun 16 09:37:20 2011 (r223145)
+++ projects/largeSMP/lib/libstand/zalloc.c Thu Jun 16 10:41:59 2011 (r223146)
@@ -154,7 +154,7 @@ zfree(MemPool *mp, void *ptr, iaddr_t by
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 by
* 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 by
/* 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
Modified: projects/largeSMP/sbin/hastd/proto_common.c
==============================================================================
--- projects/largeSMP/sbin/hastd/proto_common.c Thu Jun 16 09:37:20 2011 (r223145)
+++ projects/largeSMP/sbin/hastd/proto_common.c Thu Jun 16 10:41:59 2011 (r223146)
@@ -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 cha
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) {
Modified: projects/largeSMP/sys/net80211/ieee80211_acl.c
==============================================================================
--- projects/largeSMP/sys/net80211/ieee80211_acl.c Thu Jun 16 09:37:20 2011 (r223145)
+++ projects/largeSMP/sys/net80211/ieee80211_acl.c Thu Jun 16 10:41:59 2011 (r223146)
@@ -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, s
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:
Modified: projects/largeSMP/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- projects/largeSMP/sys/net80211/ieee80211_ioctl.c Thu Jun 16 09:37:20 2011 (r223145)
+++ projects/largeSMP/sys/net80211/ieee80211_ioctl.c Thu Jun 16 10:41:59 2011 (r223146)
@@ -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 ieee8
{
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 ie
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
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;
Modified: projects/largeSMP/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- projects/largeSMP/sys/net80211/ieee80211_ioctl.h Thu Jun 16 09:37:20 2011 (r223145)
+++ projects/largeSMP/sys/net80211/ieee80211_ioctl.h Thu Jun 16 10:41:59 2011 (r223146)
@@ -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)
More information about the svn-src-projects
mailing list