diff options
| author |   tobias <tobias@openbsd.org> | 2008-03-02 19:31:08 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2008-03-02 19:31:08 +0000 |
| commit | f8734d3b20bbeba587e583178efc4d8fcfeb7793 (patch) | |
| tree | 8e77e608ae2f7bc70647b3c81cd527287da15a0a | |
| parent | Change some spaces to tabs in the transmit functions. (diff) | |
| download | wireguard-openbsd-f8734d3b20bbeba587e583178efc4d8fcfeb7793.tar.xz wireguard-openbsd-f8734d3b20bbeba587e583178efc4d8fcfeb7793.zip | |
rcs_errno is gone: zap rcs_errstr() and rcs_errstrs[] as well.
ok joris
| -rw-r--r-- | usr.bin/cvs/rcs.c | 32 | ||||
| -rw-r--r-- | usr.bin/cvs/rcs.h | 3 |
2 files changed, 2 insertions, 33 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index 91af88565aa..d9f7de5b515 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.255 2008/03/01 21:29:37 deraadt Exp $ */ +/* $OpenBSD: rcs.c,v 1.256 2008/03/02 19:31:08 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -212,17 +212,6 @@ static struct rcs_key { #define RCS_NKEYS (sizeof(rcs_keys)/sizeof(rcs_keys[0])) -static const char *rcs_errstrs[] = { - "No error", - "No such entry", - "Duplicate entry found", - "Bad RCS number", - "Invalid RCS symbol", - "Parse error", -}; - -#define RCS_NERR (sizeof(rcs_errstrs)/sizeof(rcs_errstrs[0])) - static RCSNUM *rcs_get_revision(const char *, RCSFILE *); int rcs_patch_lines(struct cvs_lines *, struct cvs_lines *, struct cvs_line **, struct rcs_delta *); @@ -1478,25 +1467,6 @@ rcs_kflag_get(const char *flags) return (fl); } -/* - * rcs_errstr() - * - * Get the error string matching the RCS error code <code>. - */ -const char * -rcs_errstr(int code) -{ - const char *esp; - - if (code < 0 || (code >= (int)RCS_NERR && code != RCS_ERR_ERRNO)) - esp = NULL; - else if (code == RCS_ERR_ERRNO) - esp = strerror(errno); - else - esp = rcs_errstrs[code]; - return (esp); -} - /* rcs_parse_deltas() * * Parse deltas. If <rev> is not NULL, parse only as far as that diff --git a/usr.bin/cvs/rcs.h b/usr.bin/cvs/rcs.h index 1381b6b4f3c..9437665cb3e 100644 --- a/usr.bin/cvs/rcs.h +++ b/usr.bin/cvs/rcs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.h,v 1.89 2008/03/01 20:03:56 joris Exp $ */ +/* $OpenBSD: rcs.h,v 1.90 2008/03/02 19:31:08 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -255,7 +255,6 @@ int rcs_state_set(RCSFILE *, RCSNUM *, const char *); const char *rcs_state_get(RCSFILE *, RCSNUM *); int rcs_state_check(const char *); RCSNUM *rcs_tag_resolve(RCSFILE *, const char *); -const char *rcs_errstr(int); void rcs_write(RCSFILE *); int rcs_rev_write_stmp(RCSFILE *, RCSNUM *, char *, int); void rcs_rev_write_fd(RCSFILE *, RCSNUM *, int, int); |