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

Remove unused includes, use *min() inline functions rather than a

Browse Source 
home-grown macro, rewrite a confusing conditional in snpdevtotty(),
and change ibuf to 512 bytes instead of 1024 bytes in dsnwrite().

Reviewed by:	bde
This commit is contained in:
Dima Dorfman 2001-06-03 05:17:39 +00:00
parent b8edb44cc3
commit 87826386e0
3 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/dev/snp/snp.c
View File

@ -18,9 +18,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/filio.h>
#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
#include <sys/ioctl_compat.h>
#endif
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/conf.h>
@ -28,7 +25,6 @@
#include <sys/kernel.h>
#include <sys/snoop.h>
#include <sys/vnode.h>
#include <sys/conf.h>
static d_open_t snpopen;
static d_close_t snpclose;
@ -55,10 +51,6 @@ static struct cdevsw snp_cdevsw = {
};
#ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
#endif
static MALLOC_DEFINE(M_SNP, "snp", "Snoop device data");
#define ttytosnp(t) (struct snoop *)(t)->t_sc
@ -76,13 +68,13 @@ dsnwrite(struct tty *tp, struct uio *uio, int flag)
{
struct snoop *snp = ttytosnp(tp);
int error = 0;
char ibuf[1024];
char ibuf[512];
int ilen;
struct iovec iov;
struct uio uio2;
while (uio->uio_resid) {
ilen = MIN(sizeof(ibuf), uio->uio_resid);
while (uio->uio_resid > 0) {
ilen = imin(sizeof(ibuf), uio->uio_resid);
error = uiomove(ibuf, ilen, uio);
if (error)
break;
@ -125,9 +117,9 @@ snpdevtotty (dev)
struct cdevsw *cdp;
cdp = devsw(dev);
if (cdp && cdp->d_flags & D_TTY)
return (dev->si_tty);
return (NULL);
if (cdp == NULL || (cdp->d_flags & D_TTY) == 0)
return (NULL);
return (dev->si_tty);
}
#define SNP_INPUT_BUF 5 /* This is even too much, the maximal
@ -163,7 +155,7 @@ snpwrite(dev, uio, flag)
return (EIO);
while (uio->uio_resid > 0) {
len = MIN(uio->uio_resid, SNP_INPUT_BUF);
len = imin(uio->uio_resid, SNP_INPUT_BUF);
if ((error = uiomove(c, len, uio)) != 0)
return (error);
for (i=0; i < len; i++) {
@ -207,7 +199,7 @@ snpread(dev, uio, flag)
n = snp->snp_len;
while (snp->snp_len > 0 && uio->uio_resid > 0 && error == 0) {
len = MIN(uio->uio_resid, snp->snp_len);
len = min((unsigned)uio->uio_resid, snp->snp_len);
from = (caddr_t)(snp->snp_buf + snp->snp_base);
if (len == 0)
break;
@ -237,16 +229,6 @@ snpread(dev, uio, flag)
return error;
}
int
snpinc(struct snoop *snp, char c)
{
char buf;
buf = c;
return (snpin(snp, &buf, 1));
}
int
snpin(snp, buf, n)
struct snoop *snp;

34
sys/kern/tty_snoop.c
View File

@ -18,9 +18,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/filio.h>
#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
#include <sys/ioctl_compat.h>
#endif
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/conf.h>
@ -28,7 +25,6 @@
#include <sys/kernel.h>
#include <sys/snoop.h>
#include <sys/vnode.h>
#include <sys/conf.h>
static d_open_t snpopen;
static d_close_t snpclose;
@ -55,10 +51,6 @@ static struct cdevsw snp_cdevsw = {
};
#ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
#endif
static MALLOC_DEFINE(M_SNP, "snp", "Snoop device data");
#define ttytosnp(t) (struct snoop *)(t)->t_sc
@ -76,13 +68,13 @@ dsnwrite(struct tty *tp, struct uio *uio, int flag)
{
struct snoop *snp = ttytosnp(tp);
int error = 0;
char ibuf[1024];
char ibuf[512];
int ilen;
struct iovec iov;
struct uio uio2;
while (uio->uio_resid) {
ilen = MIN(sizeof(ibuf), uio->uio_resid);
while (uio->uio_resid > 0) {
ilen = imin(sizeof(ibuf), uio->uio_resid);
error = uiomove(ibuf, ilen, uio);
if (error)
break;
@ -125,9 +117,9 @@ snpdevtotty (dev)
struct cdevsw *cdp;
cdp = devsw(dev);
if (cdp && cdp->d_flags & D_TTY)
return (dev->si_tty);
return (NULL);
if (cdp == NULL || (cdp->d_flags & D_TTY) == 0)
return (NULL);
return (dev->si_tty);
}
#define SNP_INPUT_BUF 5 /* This is even too much, the maximal
@ -163,7 +155,7 @@ snpwrite(dev, uio, flag)
return (EIO);
while (uio->uio_resid > 0) {
len = MIN(uio->uio_resid, SNP_INPUT_BUF);
len = imin(uio->uio_resid, SNP_INPUT_BUF);
if ((error = uiomove(c, len, uio)) != 0)
return (error);
for (i=0; i < len; i++) {
@ -207,7 +199,7 @@ snpread(dev, uio, flag)
n = snp->snp_len;
while (snp->snp_len > 0 && uio->uio_resid > 0 && error == 0) {
len = MIN(uio->uio_resid, snp->snp_len);
len = min((unsigned)uio->uio_resid, snp->snp_len);
from = (caddr_t)(snp->snp_buf + snp->snp_base);
if (len == 0)
break;
@ -237,16 +229,6 @@ snpread(dev, uio, flag)
return error;
}
int
snpinc(struct snoop *snp, char c)
{
char buf;
buf = c;
return (snpin(snp, &buf, 1));
}
int
snpin(snp, buf, n)
struct snoop *snp;

1
sys/sys/snoop.h
View File

@ -60,7 +60,6 @@ struct snoop {
/* XXX several wrong storage classes and types here. */
int snpdown __P((struct snoop *snp));
int snpin __P((struct snoop *snp, char *buf, int n));
int snpinc __P((struct snoop *snp, char c));
#endif /* _KERNEL */
/*