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/svr4_termios.c | |
| parent | 3766ed332bdcef24740f98c2436c881180add6a4 (diff) | |
| download | src-test2-13ccadd4b00cd6944ff3e60bee50aa629a769016.tar.gz src-test2-13ccadd4b00cd6944ff3e60bee50aa629a769016.zip | |
Notes
Diffstat (limited to 'sys/svr4/svr4_termios.c')
| -rw-r--r-- | sys/svr4/svr4_termios.c | 12 |
1 files changed, 5 insertions, 7 deletions
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: |