diff options
author | Jared Yanovich <jaredy@cvs.openbsd.org> | 2006-04-10 14:39:00 +0000 |
---|---|---|
committer | Jared Yanovich <jaredy@cvs.openbsd.org> | 2006-04-10 14:39:00 +0000 |
commit | c3b47b23cd9ff88d1b0ee85bcb2a4024191e6bd0 (patch) | |
tree | 0a9482fe89254a79f2058e55b3af99813dbe6b84 | |
parent | b95bf72aa9967c54c56dfead82b7844e05f41f47 (diff) |
fix lint comments, no functional changes; ok ray
-rw-r--r-- | bin/ksh/c_sh.c | 6 | ||||
-rw-r--r-- | bin/ksh/eval.c | 4 | ||||
-rw-r--r-- | bin/ksh/exec.c | 6 | ||||
-rw-r--r-- | bin/ksh/expr.c | 6 | ||||
-rw-r--r-- | bin/ksh/lex.c | 10 | ||||
-rw-r--r-- | bin/ksh/main.c | 18 | ||||
-rw-r--r-- | bin/ksh/syn.c | 4 | ||||
-rw-r--r-- | bin/ksh/tree.c | 4 | ||||
-rw-r--r-- | bin/ksh/vi.c | 6 |
9 files changed, 32 insertions, 32 deletions
diff --git a/bin/ksh/c_sh.c b/bin/ksh/c_sh.c index 675b7a3ef71..89e0f30dbcf 100644 --- a/bin/ksh/c_sh.c +++ b/bin/ksh/c_sh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_sh.c,v 1.34 2006/03/21 09:00:23 otto Exp $ */ +/* $OpenBSD: c_sh.c,v 1.35 2006/04/10 14:38:59 jaredy Exp $ */ /* * built-in Bourne commands @@ -547,7 +547,7 @@ c_exitreturn(char **wp) quitenv(NULL); /* get rid of any i/o redirections */ unwind(how); - /*NOTREACHED*/ + /* NOTREACHED */ return 0; } @@ -601,7 +601,7 @@ c_brkcont(char **wp) } unwind(*wp[0] == 'b' ? LBREAK : LCONTIN); - /*NOTREACHED*/ + /* NOTREACHED */ } int diff --git a/bin/ksh/eval.c b/bin/ksh/eval.c index e2fc7fee64b..33006dd0b63 100644 --- a/bin/ksh/eval.c +++ b/bin/ksh/eval.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eval.c,v 1.29 2006/03/17 16:30:13 millert Exp $ */ +/* $OpenBSD: eval.c,v 1.30 2006/04/10 14:38:59 jaredy Exp $ */ /* * Expansion - quoting, separation, substitution, globbing @@ -344,7 +344,7 @@ expand(char *cp, /* input word */ case '?': f &= ~DOBLANK; f |= DOTEMP_; - /* fall through */ + /* FALLTHROUGH */ default: /* Enable tilde expansion */ tilde_ok = 1; diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c index 3ef3103ab87..0e2abc5fe78 100644 --- a/bin/ksh/exec.c +++ b/bin/ksh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.45 2006/03/17 16:30:13 millert Exp $ */ +/* $OpenBSD: exec.c,v 1.46 2006/04/10 14:38:59 jaredy Exp $ */ /* * execute command tree @@ -167,7 +167,7 @@ execute(struct op *volatile t, sigprocmask(SIG_SETMASK, &omask, (sigset_t *) 0); quitenv(NULL); unwind(i); - /*NOTREACHED*/ + /* NOTREACHED */ } /* Already have a (live) co-process? */ if (coproc.job && coproc.write >= 0) @@ -614,7 +614,7 @@ comexec(struct op *t, struct tbl *volatile tp, char **ap, volatile int flags) case LSHELL: quitenv(NULL); unwind(i); - /*NOTREACHED*/ + /* NOTREACHED */ default: quitenv(NULL); internal_errorf(1, "CFUNC %d", i); diff --git a/bin/ksh/expr.c b/bin/ksh/expr.c index a4e97d3bb16..4ee87318073 100644 --- a/bin/ksh/expr.c +++ b/bin/ksh/expr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expr.c,v 1.18 2005/03/30 17:16:37 deraadt Exp $ */ +/* $OpenBSD: expr.c,v 1.19 2006/04/10 14:38:59 jaredy Exp $ */ /* * Korn expression evaluation @@ -189,7 +189,7 @@ v_evaluate(struct tbl *vp, const char *expr, volatile int error_ok, errorf(null); } unwind(i); - /*NOTREACHED*/ + /* NOTREACHED */ } token(es); @@ -307,7 +307,7 @@ evalexpr(Expr_state *es, enum prec prec) token(es); } else { evalerr(es, ET_UNEXPECTED, (char *) 0); - /*NOTREACHED*/ + /* NOTREACHED */ } if (es->tok == O_PLUSPLUS || es->tok == O_MINUSMINUS) { vl = do_ppmm(es, es->tok, vl, false); diff --git a/bin/ksh/lex.c b/bin/ksh/lex.c index 416d8584795..860c6bf1365 100644 --- a/bin/ksh/lex.c +++ b/bin/ksh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.38 2005/12/11 20:31:21 otto Exp $ */ +/* $OpenBSD: lex.c,v 1.39 2006/04/10 14:38:59 jaredy Exp $ */ /* * lexical analysis and source input @@ -249,7 +249,7 @@ yylex(int cf) *wp++ = c; break; } - /* fall through.. */ + /* FALLTHROUGH */ Sbase1: /* includes *(...|...) pattern (*+?@!) */ if (c == '*' || c == '@' || c == '+' || c == '?' || c == '!') { @@ -262,7 +262,7 @@ yylex(int cf) } ungetsc(c2); } - /* fall through.. */ + /* FALLTHROUGH */ Sbase2: /* doesn't include *(...|...) pattern (*+?@!) */ switch (c) { case '\\': @@ -568,7 +568,7 @@ yylex(int cf) *wp++ = c; break; } - /* fall through.. */ + /* FALLTHROUGH */ default: if (c) { /* trailing \ is lost */ *wp++ = '\\'; @@ -1449,7 +1449,7 @@ get_brace_var(XString *wsp, char *wp) state = PS_SAW_HASH; break; } - /* fall through.. */ + /* FALLTHROUGH */ case PS_SAW_HASH: if (letter(c)) state = PS_IDENT; diff --git a/bin/ksh/main.c b/bin/ksh/main.c index 07014658ed3..3bf7555d41b 100644 --- a/bin/ksh/main.c +++ b/bin/ksh/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.40 2005/12/11 20:31:21 otto Exp $ */ +/* $OpenBSD: main.c,v 1.41 2006/04/10 14:38:59 jaredy Exp $ */ /* * startup, main loop, environments and error handling @@ -431,15 +431,15 @@ include(const char *name, int argc, char **argv, int intr_ok) */ if (intr_ok && (exstat - 128) != SIGTERM) return 1; - /* fall through... */ + /* FALLTHROUGH */ case LEXIT: case LLEAVE: case LSHELL: unwind(i); - /*NOREACHED*/ + /* NOTREACHED */ default: internal_errorf(1, "include: %d", i); - /*NOREACHED*/ + /* NOTREACHED */ } } if (argv) { @@ -509,19 +509,19 @@ shell(Source *volatile s, volatile int toplevel) s->start = s->str = null; break; } - /* fall through... */ + /* FALLTHROUGH */ case LEXIT: case LLEAVE: case LRETURN: source = old_source; quitenv(NULL); unwind(i); /* keep on going */ - /*NOREACHED*/ + /* NOTREACHED */ default: source = old_source; quitenv(NULL); internal_errorf(1, "shell: %d", i); - /*NOREACHED*/ + /* NOTREACHED */ } } @@ -597,12 +597,12 @@ unwind(int i) case E_LOOP: case E_ERRH: siglongjmp(e->jbuf, i); - /*NOTREACHED*/ + /* NOTREACHED */ case E_NONE: if (i == LINTR) e->flags |= EF_FAKE_SIGDIE; - /* Fall through... */ + /* FALLTHROUGH */ default: quitenv(NULL); diff --git a/bin/ksh/syn.c b/bin/ksh/syn.c index 58ae46ff1cc..dc1d49ed61a 100644 --- a/bin/ksh/syn.c +++ b/bin/ksh/syn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syn.c,v 1.26 2006/03/21 10:41:26 otto Exp $ */ +/* $OpenBSD: syn.c,v 1.27 2006/04/10 14:38:59 jaredy Exp $ */ /* * shell parser (C version) @@ -695,7 +695,7 @@ syntaxerr(const char *what) } /* don't quote the EOF */ yyerror("syntax error: unexpected EOF\n"); - /*NOTREACHED*/ + /* NOTREACHED */ case LWORD: s = snptreef((char *) 0, 32, "%S", yylval.cp); diff --git a/bin/ksh/tree.c b/bin/ksh/tree.c index 8cecead2ae4..a9c725b34b1 100644 --- a/bin/ksh/tree.c +++ b/bin/ksh/tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $ */ +/* $OpenBSD: tree.c,v 1.18 2006/04/10 14:38:59 jaredy Exp $ */ /* * command tree climbing @@ -96,7 +96,7 @@ ptree(struct op *t, int indent, struct shf *shf) } case TSELECT: fptreef(shf, indent, "select %s ", t->str); - /* fall through */ + /* FALLTHROUGH */ case TFOR: if (t->type == TFOR) fptreef(shf, indent, "for %s ", t->str); diff --git a/bin/ksh/vi.c b/bin/ksh/vi.c index 9ce4acaf341..e815a1cd868 100644 --- a/bin/ksh/vi.c +++ b/bin/ksh/vi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vi.c,v 1.22 2005/12/11 20:31:21 otto Exp $ */ +/* $OpenBSD: vi.c,v 1.23 2006/04/10 14:38:59 jaredy Exp $ */ /* * vi command editing @@ -853,7 +853,7 @@ vi_cmd(int argcnt, const char *cmd) case 'g': if (!argcnt) argcnt = hlast; - /* fall through */ + /* FALLTHROUGH */ case 'G': if (!argcnt) argcnt = 1; @@ -996,7 +996,7 @@ vi_cmd(int argcnt, const char *cmd) c3 = 1; srchlen = 0; lastsearch = *cmd; - /* fall through */ + /* FALLTHROUGH */ case 'n': case 'N': if (lastsearch == ' ') |