diff options
Diffstat (limited to 'bin/ed')
| -rw-r--r-- | bin/ed/buf.c | 6 | ||||
| -rw-r--r-- | bin/ed/cbc.c | 8 | ||||
| -rw-r--r-- | bin/ed/main.c | 10 |
3 files changed, 10 insertions, 14 deletions
diff --git a/bin/ed/buf.c b/bin/ed/buf.c index 3406e404754..e15df61af56 100644 --- a/bin/ed/buf.c +++ b/bin/ed/buf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.c,v 1.16 2003/10/18 19:15:43 jmc Exp $ */ +/* $OpenBSD: buf.c,v 1.17 2006/04/25 15:41:07 deraadt Exp $ */ /* $NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $ */ /* buf.c: This file contains the scratch-file buffer routines for the @@ -33,7 +33,7 @@ #if 0 static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp"; #else -static char rcsid[] = "$OpenBSD: buf.c,v 1.16 2003/10/18 19:15:43 jmc Exp $"; +static char rcsid[] = "$OpenBSD: buf.c,v 1.17 2006/04/25 15:41:07 deraadt Exp $"; #endif #endif /* not lint */ @@ -64,7 +64,7 @@ get_sbuf_line(line_t *lp) /* out of position */ if (sfseek != lp->seek) { sfseek = lp->seek; - if (fseek(sfp, sfseek, SEEK_SET) < 0) { + if (fseeko(sfp, sfseek, SEEK_SET) < 0) { perror(NULL); seterrmsg("cannot seek temp file"); return NULL; diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c index 65a3290bbe5..891757a2896 100644 --- a/bin/ed/cbc.c +++ b/bin/ed/cbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cbc.c,v 1.13 2004/05/08 07:05:19 deraadt Exp $ */ +/* $OpenBSD: cbc.c,v 1.14 2006/04/25 15:41:07 deraadt Exp $ */ /* $NetBSD: cbc.c,v 1.9 1995/03/21 09:04:36 cgd Exp $ */ /* cbc.c: This file contains the encryption routines for the ed line editor */ @@ -40,7 +40,7 @@ #if 0 static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp"; #else -static char rcsid[] = "$OpenBSD: cbc.c,v 1.13 2004/05/08 07:05:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cbc.c,v 1.14 2006/04/25 15:41:07 deraadt Exp $"; #endif #endif /* not lint */ @@ -86,10 +86,6 @@ typedef char Desbuf[8]; * global variables and related macros */ -enum { /* encrypt, decrypt, authenticate */ - MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE -} mode = MODE_ENCRYPT; - Desbuf ivec; /* initialization vector */ Desbuf pvec; /* padding vector */ char bits[] = { /* used to extract bits from a char */ diff --git a/bin/ed/main.c b/bin/ed/main.c index 40299ec4723..b24c96e746b 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.29 2006/04/17 16:17:03 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.30 2006/04/25 15:41:07 deraadt Exp $ */ /* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */ /* main.c: This file contains the main control and user-interface routines @@ -39,7 +39,7 @@ char *copyright = #if 0 static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.29 2006/04/17 16:17:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.30 2006/04/25 15:41:07 deraadt Exp $"; #endif #endif /* not lint */ @@ -387,7 +387,7 @@ next_addr(void) addr = addr_last; break; } - /* FALL THROUGH */ + /* FALLTHROUGH */ default: if (ibufp == hd) return EOF; @@ -533,7 +533,7 @@ exec_command(void) case 'e': if (modified && !scripted) return EMOD; - /* fall through */ + /* FALLTHROUGH */ case 'E': if (addr_cnt > 0) { seterrmsg("unexpected address"); @@ -1452,7 +1452,7 @@ handle_winch(int signo) struct winsize ws; /* window size structure */ sigflags &= ~(1 << (signo - 1)); - if (ioctl(0, TIOCGWINSZ, (char *) &ws) >= 0) { + if (ioctl(0, TIOCGWINSZ, &ws) >= 0) { if (ws.ws_row > 2) rows = ws.ws_row - 2; if (ws.ws_col > 8) |