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

Correctly declare variables as u_int rather than doing typecasts.

Browse Source 
Kill some register declarations while I'm here.

Submitted by:  bde (1)
This commit is contained in:
Jonathan Lemon 2001-02-27 15:11:31 +00:00
parent 157449fd79
commit ea0237ed11
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/sys_generic.c
View File

@ -73,7 +73,7 @@ static MALLOC_DEFINE(M_IOCTLOPS, "ioctlops", "ioctl data buffer");
static MALLOC_DEFINE(M_SELECT, "select", "select() buffer"); static MALLOC_DEFINE(M_SELECT, "select", "select() buffer");
MALLOC_DEFINE(M_IOV, "iov", "large iov's"); MALLOC_DEFINE(M_IOV, "iov", "large iov's");
static int pollscan __P((struct proc *, struct pollfd *, int)); static int pollscan __P((struct proc *, struct pollfd *, u_int));
static int selscan __P((struct proc *, fd_mask **, fd_mask **, int)); static int selscan __P((struct proc *, fd_mask **, fd_mask **, int));
static int dofileread __P((struct proc *, struct file *, int, void *, static int dofileread __P((struct proc *, struct file *, int, void *,
size_t, off_t, int)); size_t, off_t, int));
@ -852,13 +852,14 @@ struct poll_args {
#endif #endif
int int
poll(p, uap) poll(p, uap)
register struct proc *p; struct proc *p;
register struct poll_args *uap; struct poll_args *uap;
{ {
caddr_t bits; caddr_t bits;
char smallbits[32 * sizeof(struct pollfd)]; char smallbits[32 * sizeof(struct pollfd)];
struct timeval atv, rtv, ttv; struct timeval atv, rtv, ttv;
int s, ncoll, error = 0, timo, nfds; int s, ncoll, error = 0, timo;
u_int nfds;
size_t ni; size_t ni;
nfds = SCARG(uap, nfds); nfds = SCARG(uap, nfds);
@ -869,8 +870,7 @@ poll(p, uap)
* least enough for the current limits. We want to be reasonably * least enough for the current limits. We want to be reasonably
* safe, but not overly restrictive. * safe, but not overly restrictive.
*/ */
if ((u_int)nfds > p->p_rlimit[RLIMIT_NOFILE].rlim_cur && if (nfds > p->p_rlimit[RLIMIT_NOFILE].rlim_cur && nfds > FD_SETSIZE)
(u_int)nfds > FD_SETSIZE)
return (EINVAL); return (EINVAL);
ni = nfds * sizeof(struct pollfd); ni = nfds * sizeof(struct pollfd);
if (ni > sizeof(smallbits)) if (ni > sizeof(smallbits))
@ -946,7 +946,7 @@ static int
pollscan(p, fds, nfd) pollscan(p, fds, nfd)
struct proc *p; struct proc *p;
struct pollfd *fds; struct pollfd *fds;
int nfd; u_int nfd;
{ {
register struct filedesc *fdp = p->p_fd; register struct filedesc *fdp = p->p_fd;
int i; int i;