diff options
author | Brian Feldman <green@FreeBSD.org> | 1999-09-19 17:00:25 +0000 |
---|---|---|
committer | Brian Feldman <green@FreeBSD.org> | 1999-09-19 17:00:25 +0000 |
commit | 13ccadd4b00cd6944ff3e60bee50aa629a769016 (patch) | |
tree | 2f920b8f03eefb9572a7d1cbc421e737d3c50ce7 /sys/svr4 | |
parent | 3766ed332bdcef24740f98c2436c881180add6a4 (diff) | |
download | src-test2-13ccadd4b00cd6944ff3e60bee50aa629a769016.tar.gz src-test2-13ccadd4b00cd6944ff3e60bee50aa629a769016.zip |
Notes
Diffstat (limited to 'sys/svr4')
-rw-r--r-- | sys/svr4/svr4_fcntl.c | 2 | ||||
-rw-r--r-- | sys/svr4/svr4_filio.c | 4 | ||||
-rw-r--r-- | sys/svr4/svr4_sockio.c | 6 | ||||
-rw-r--r-- | sys/svr4/svr4_stream.c | 3 | ||||
-rw-r--r-- | sys/svr4/svr4_termios.c | 12 | ||||
-rw-r--r-- | sys/svr4/svr4_ttold.c | 27 |
6 files changed, 21 insertions, 33 deletions
diff --git a/sys/svr4/svr4_fcntl.c b/sys/svr4/svr4_fcntl.c index 60b975966a4b..a0b4e397682f 100644 --- a/sys/svr4/svr4_fcntl.c +++ b/sys/svr4/svr4_fcntl.c @@ -379,7 +379,7 @@ svr4_sys_open(p, uap) /* ignore any error, just give it a try */ if (fp->f_type == DTYPE_VNODE) - (fp->f_ops->fo_ioctl) (fp, TIOCSCTTY, (caddr_t) 0, p); + fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, p); #endif } return error; diff --git a/sys/svr4/svr4_filio.c b/sys/svr4/svr4_filio.c index 0be9f221c7bc..9d404c749864 100644 --- a/sys/svr4/svr4_filio.c +++ b/sys/svr4/svr4_filio.c @@ -196,8 +196,6 @@ svr4_fil_ioctl(fp, p, retval, fd, cmd, data) int error; int num; struct filedesc *fdp = p->p_fd; - int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) = - fp->f_ops->fo_ioctl; *retval = 0; @@ -229,7 +227,7 @@ svr4_fil_ioctl(fp, p, retval, fd, cmd, data) #ifdef SVR4_DEBUG if (cmd == FIOASYNC) DPRINTF(("FIOASYNC\n")); #endif - error = (*ctl)(fp, cmd, (caddr_t) &num, p); + error = fo_ioctl(fp, cmd, (caddr_t) &num, p); if (error) return error; diff --git a/sys/svr4/svr4_sockio.c b/sys/svr4/svr4_sockio.c index 7d6184612762..8fe80998010a 100644 --- a/sys/svr4/svr4_sockio.c +++ b/sys/svr4/svr4_sockio.c @@ -88,8 +88,6 @@ svr4_sock_ioctl(fp, p, retval, fd, cmd, data) caddr_t data; { int error; - int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) = - fp->f_ops->fo_ioctl; *retval = 0; @@ -136,7 +134,7 @@ svr4_sock_ioctl(fp, p, retval, fd, cmd, data) (void) strncpy(br.ifr_name, sr.svr4_ifr_name, sizeof(br.ifr_name)); - if ((error = (*ctl)(fp, SIOCGIFFLAGS, + if ((error = fo_ioctl(fp, SIOCGIFFLAGS, (caddr_t) &br, p)) != 0) { DPRINTF(("SIOCGIFFLAGS (%s) %s: error %d\n", br.ifr_name, sr.svr4_ifr_name, error)); @@ -160,7 +158,7 @@ svr4_sock_ioctl(fp, p, retval, fd, cmd, data) sizeof(struct ifreq), sizeof(struct svr4_ifreq), sc.svr4_ifc_len)); - if ((error = (*ctl)(fp, OSIOCGIFCONF, + if ((error = fo_ioctl(fp, OSIOCGIFCONF, (caddr_t) &sc, p)) != 0) return error; diff --git a/sys/svr4/svr4_stream.c b/sys/svr4/svr4_stream.c index 4ced1bc07f3a..873b57af7853 100644 --- a/sys/svr4/svr4_stream.c +++ b/sys/svr4/svr4_stream.c @@ -1255,8 +1255,7 @@ i_nread(fp, p, retval, fd, cmd, dat) * for us, and if we do, then we assume that we have at least one * message waiting for us. */ - if ((error = (*fp->f_ops->fo_ioctl)(fp, FIONREAD, - (caddr_t) &nread, p)) != 0) + if ((error = fo_ioctl(fp, FIONREAD, (caddr_t) &nread, p)) != 0) return error; if (nread != 0) diff --git a/sys/svr4/svr4_termios.c b/sys/svr4/svr4_termios.c index 450c0847a99e..12d533b395a4 100644 --- a/sys/svr4/svr4_termios.c +++ b/sys/svr4/svr4_termios.c @@ -502,8 +502,6 @@ svr4_term_ioctl(fp, p, retval, fd, cmd, data) struct svr4_termios st; struct svr4_termio t; int error, new; - int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) = - fp->f_ops->fo_ioctl; *retval = 0; @@ -513,7 +511,7 @@ svr4_term_ioctl(fp, p, retval, fd, cmd, data) case SVR4_TCGETA: case SVR4_TCGETS: DPRINTF(("ioctl(TCGET%c);\n", cmd == SVR4_TCGETA ? 'A' : 'S')); - if ((error = (*ctl)(fp, TIOCGETA, (caddr_t) &bt, p)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, p)) != 0) return error; memset(&st, 0, sizeof(st)); @@ -540,7 +538,7 @@ svr4_term_ioctl(fp, p, retval, fd, cmd, data) case SVR4_TCSETSF: DPRINTF(("TCSET{A,S,AW,SW,AF,SF}\n")); /* get full BSD termios so we don't lose information */ - if ((error = (*ctl)(fp, TIOCGETA, (caddr_t) &bt, p)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, p)) != 0) return error; switch (cmd) { @@ -591,14 +589,14 @@ svr4_term_ioctl(fp, p, retval, fd, cmd, data) print_svr4_termios(&st); #endif /* DEBUG_SVR4 */ - return (*ctl)(fp, cmd, (caddr_t) &bt, p); + return fo_ioctl(fp, cmd, (caddr_t) &bt, p); case SVR4_TIOCGWINSZ: DPRINTF(("TIOCGWINSZ\n")); { struct svr4_winsize ws; - error = (*ctl)(fp, TIOCGWINSZ, (caddr_t) &ws, p); + error = fo_ioctl(fp, TIOCGWINSZ, (caddr_t) &ws, p); if (error) return error; return copyout(&ws, data, sizeof(ws)); @@ -611,7 +609,7 @@ svr4_term_ioctl(fp, p, retval, fd, cmd, data) if ((error = copyin(data, &ws, sizeof(ws))) != 0) return error; - return (*ctl)(fp, TIOCSWINSZ, (caddr_t) &ws, p); + return fo_ioctl(fp, TIOCSWINSZ, (caddr_t) &ws, p); } default: diff --git a/sys/svr4/svr4_ttold.c b/sys/svr4/svr4_ttold.c index d597691cc699..699d44d0aa00 100644 --- a/sys/svr4/svr4_ttold.c +++ b/sys/svr4/svr4_ttold.c @@ -196,8 +196,6 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) caddr_t data; { int error; - int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *)) = - fp->f_ops->fo_ioctl; *retval = 0; @@ -206,8 +204,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) { pid_t pid; - if ((error = (*ctl)(fp, TIOCGPGRP, - (caddr_t) &pid, p)) != 0) + if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid, p)) != 0) return error; DPRINTF(("TIOCGPGRP %d\n", pid)); @@ -226,15 +223,14 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) DPRINTF(("TIOCSPGRP %d\n", pid)); - return (*ctl)(fp, TIOCSPGRP, (caddr_t) &pid, p); + return fo_ioctl(fp, TIOCSPGRP, (caddr_t) &pid, p); } case SVR4_TIOCGSID: { #if defined(TIOCGSID) pid_t pid; - if ((error = (*ctl)(fp, TIOCGSID, - (caddr_t) &pid, p)) != 0) + if ((error = fo_ioctl(fp, TIOCGSID, (caddr_t) &pid, p)) != 0) return error; DPRINTF(("TIOCGSID %d\n", pid)); @@ -251,7 +247,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) struct sgttyb bs; struct svr4_sgttyb ss; - error = (*ctl)(fp, TIOCGETP, (caddr_t) &bs, p); + error = fo_ioctl(fp, TIOCGETP, (caddr_t) &bs, p); if (error) return error; @@ -276,7 +272,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) print_svr4_sgttyb("SVR4_TIOCSET{P,N}", &ss); #endif /* DEBUG_SVR4 */ cmd = (cmd == SVR4_TIOCSETP) ? TIOCSETP : TIOCSETN; - return (*ctl)(fp, cmd, (caddr_t) &bs, p); + return fo_ioctl(fp, cmd, (caddr_t) &bs, p); } case SVR4_TIOCGETC: @@ -284,7 +280,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) struct tchars bt; struct svr4_tchars st; - error = (*ctl)(fp, TIOCGETC, (caddr_t) &bt, p); + error = fo_ioctl(fp, TIOCGETC, (caddr_t) &bt, p); if (error) return error; @@ -307,7 +303,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) #ifdef DEBUG_SVR4 print_svr4_tchars("SVR4_TIOCSETC", &st); #endif /* DEBUG_SVR4 */ - return (*ctl)(fp, TIOCSETC, (caddr_t) &bt, p); + return fo_ioctl(fp, TIOCSETC, (caddr_t) &bt, p); } case SVR4_TIOCGLTC: @@ -315,7 +311,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) struct ltchars bl; struct svr4_ltchars sl; - error = (*ctl)(fp, TIOCGLTC, (caddr_t) &bl, p); + error = fo_ioctl(fp, TIOCGLTC, (caddr_t) &bl, p); if (error) return error; @@ -338,14 +334,13 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) #ifdef DEBUG_SVR4 print_svr4_ltchars("SVR4_TIOCSLTC", &sl); #endif /* DEBUG_SVR4 */ - return (*ctl)(fp, TIOCSLTC, (caddr_t) &bl, p); + return fo_ioctl(fp, TIOCSLTC, (caddr_t) &bl, p); } case SVR4_TIOCLGET: { int flags; - if ((error = (*ctl)(fp, TIOCLGET, - (caddr_t) &flags, p)) != 0) + if ((error = fo_ioctl(fp, TIOCLGET, (caddr_t) &flags, p)) != 0) return error; DPRINTF(("SVR4_TIOCLGET %o\n", flags)); return copyout(&flags, data, sizeof(flags)); @@ -373,7 +368,7 @@ svr4_ttold_ioctl(fp, p, retval, fd, cmd, data) } DPRINTF(("SVR4_TIOCL{SET,BIS,BIC} %o\n", flags)); - return (*ctl)(fp, cmd, (caddr_t) &flags, p); + return fo_ioctl(fp, cmd, (caddr_t) &flags, p); } default: |