diff options
| author | mmcc <mmcc@cvs.openbsd.org> | 2015-12-14 06:09:44 +0000 |
|---|---|---|
| committer | mmcc <mmcc@cvs.openbsd.org> | 2015-12-14 06:09:44 +0000 |
| commit | f416a12007781d2f22f7339818bc899654e1dea1 (patch) | |
| tree | 5feb84e46f235e15a98bb2303d19114b5adb18b3 /bin | |
| parent | e6ac9718e80ed1b670cb2e434c5ae19ec15ea631 (diff) | |
Remove a superfluous macro. No binary change. ok tb@
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ksh/c_sh.c | 4 | ||||
| -rw-r--r-- | bin/ksh/history.c | 4 | ||||
| -rw-r--r-- | bin/ksh/lex.c | 4 | ||||
| -rw-r--r-- | bin/ksh/shf.h | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/bin/ksh/c_sh.c b/bin/ksh/c_sh.c index 6ac00e851f2..f1574543ae9 100644 --- a/bin/ksh/c_sh.c +++ b/bin/ksh/c_sh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_sh.c,v 1.55 2015/11/12 04:04:31 mmcc Exp $ */ +/* $OpenBSD: c_sh.c,v 1.56 2015/12/14 06:09:43 mmcc Exp $ */ /* * built-in Bourne commands @@ -327,7 +327,7 @@ c_read(char **wp) if (c == '\0') continue; if (c == EOF && shf_error(shf) && - shf_errno(shf) == EINTR) { + shf->errno_ == EINTR) { /* Was the offending signal one that * would normally kill a process? * If so, pretend the read was killed. diff --git a/bin/ksh/history.c b/bin/ksh/history.c index 824e20619f9..ca65940b8ca 100644 --- a/bin/ksh/history.c +++ b/bin/ksh/history.c @@ -1,4 +1,4 @@ -/* $OpenBSD: history.c,v 1.53 2015/11/02 16:38:35 mmcc Exp $ */ +/* $OpenBSD: history.c,v 1.54 2015/12/14 06:09:43 mmcc Exp $ */ /* * command history @@ -253,7 +253,7 @@ c_fc(char **wp) } if (n < 0) { bi_errorf("error reading temp file %s - %s", - tf->name, strerror(shf_errno(shf))); + tf->name, strerror(shf->errno_)); shf_close(shf); return 1; } diff --git a/bin/ksh/lex.c b/bin/ksh/lex.c index 177c06d2275..54901707a36 100644 --- a/bin/ksh/lex.c +++ b/bin/ksh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.64 2015/11/18 15:31:21 nicm Exp $ */ +/* $OpenBSD: lex.c,v 1.65 2015/12/14 06:09:43 mmcc Exp $ */ /* * lexical analysis and source input @@ -1121,7 +1121,7 @@ getsc_line(Source *s) char *p = shf_getse(xp, Xnleft(s->xs, xp), s->u.shf); if (!p && shf_error(s->u.shf) && - shf_errno(s->u.shf) == EINTR) { + s->u.shf->errno_ == EINTR) { shf_clearerr(s->u.shf); if (trap) runtraps(0); diff --git a/bin/ksh/shf.h b/bin/ksh/shf.h index 44e31abe0fb..31be7fb2c4d 100644 --- a/bin/ksh/shf.h +++ b/bin/ksh/shf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: shf.h,v 1.7 2015/10/21 15:47:41 mmcc Exp $ */ +/* $OpenBSD: shf.h,v 1.8 2015/12/14 06:09:43 mmcc Exp $ */ #ifndef SHF_H # define SHF_H @@ -15,7 +15,6 @@ ((shf)->wnleft--, *(shf)->wp++ = (c))) #define shf_eof(shf) ((shf)->flags & SHF_EOF) #define shf_error(shf) ((shf)->flags & SHF_ERROR) -#define shf_errno(shf) ((shf)->errno_) #define shf_clearerr(shf) ((shf)->flags &= ~(SHF_EOF | SHF_ERROR)) /* Flags passed to shf_*open() */ |