diff options
| -rw-r--r-- | usr.bin/cvs/annotate.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/checkout.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/commit.c | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/log.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/remove.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/watch.c | 7 |
6 files changed, 14 insertions, 14 deletions
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c index b5e391f352b..f00ecc1fb12 100644 --- a/usr.bin/cvs/annotate.c +++ b/usr.bin/cvs/annotate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: annotate.c,v 1.62 2010/07/30 21:47:18 ray Exp $ */ +/* $OpenBSD: annotate.c,v 1.63 2011/12/27 13:59:01 nicm Exp $ */ /* * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -32,7 +32,6 @@ void cvs_annotate_local(struct cvs_file *); extern char *cvs_specified_tag; -static char *dateflag; static int force_head = 0; struct cvs_cmd cvs_cmd_annotate = { @@ -60,6 +59,7 @@ cvs_annotate(int argc, char **argv) { int ch, flags; char *arg = "."; + char *dateflag = NULL; struct cvs_recursion cr; flags = CR_RECURSE_DIRS; diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index 3bd567275b1..24c922ede54 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.167 2010/07/30 21:47:18 ray Exp $ */ +/* $OpenBSD: checkout.c,v 1.168 2011/12/27 13:59:01 nicm Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -48,7 +48,6 @@ static char *dateflag = NULL; static int nflag = 0; -static char lastwd[MAXPATHLEN]; char *checkout_target_dir = NULL; time_t cvs_specified_date = -1; @@ -478,6 +477,7 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, char *tag, int co_flags) char *entry, *tosend; char kbuf[8], sticky[CVS_REV_BUFSZ], rev[CVS_REV_BUFSZ]; char timebuf[CVS_TIME_BUFSZ], tbuf[CVS_TIME_BUFSZ]; + static char lastwd[MAXPATHLEN]; exists = 0; tosend = NULL; diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 3ddb807c817..a1520984789 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.151 2011/04/20 18:41:40 nicm Exp $ */ +/* $OpenBSD: commit.c,v 1.152 2011/12/27 13:59:01 nicm Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -44,10 +44,11 @@ struct cvs_flisthead files_added; struct cvs_flisthead files_removed; struct cvs_flisthead files_modified; -int conflicts_found; char *logmsg = NULL; char *loginfo = NULL; +static int conflicts_found; + struct cvs_cmd cvs_cmd_commit = { CVS_OP_COMMIT, CVS_USE_WDIR | CVS_LOCK_REPO, "commit", { "ci", "com" }, diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c index cde6f72049d..b2237be3fd3 100644 --- a/usr.bin/cvs/log.c +++ b/usr.bin/cvs/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.45 2008/06/12 16:53:12 joris Exp $ */ +/* $OpenBSD: log.c,v 1.46 2011/12/27 13:59:01 nicm Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -31,7 +31,6 @@ #include "cvs.h" extern char *__progname; -static int send_m = 1; /* * cvs_log() @@ -126,6 +125,7 @@ cvs_vlog(u_int level, const char *fmt, va_list vap) int cvs_printf(const char *fmt, ...) { + static int send_m = 1; int ret; char *nstr, *dp, *sp; va_list vap; diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c index 5b15a8a0e28..72a0575840f 100644 --- a/usr.bin/cvs/remove.c +++ b/usr.bin/cvs/remove.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remove.c,v 1.80 2009/02/21 14:50:53 joris Exp $ */ +/* $OpenBSD: remove.c,v 1.81 2011/12/27 13:59:01 nicm Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -26,7 +26,6 @@ extern char *__progname; void cvs_remove_force(struct cvs_file *); -static int force_remove = 0; static int removed = 0; static int existing = 0; @@ -47,6 +46,7 @@ cvs_remove(int argc, char **argv) int flags; char *arg = "."; struct cvs_recursion cr; + int force_remove = 0; flags = CR_RECURSE_DIRS; while ((ch = getopt(argc, argv, cvs_cmd_remove.cmd_opts)) != -1) { diff --git a/usr.bin/cvs/watch.c b/usr.bin/cvs/watch.c index 8d850b6fdff..77e3893e89b 100644 --- a/usr.bin/cvs/watch.c +++ b/usr.bin/cvs/watch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: watch.c,v 1.21 2008/06/23 20:51:08 ragge Exp $ */ +/* $OpenBSD: watch.c,v 1.22 2011/12/27 13:59:01 nicm Exp $ */ /* * Copyright (c) 2005-2007 Xavier Santolaria <xsa@openbsd.org> * @@ -33,9 +33,6 @@ static void cvs_watch_local(struct cvs_file *); static void cvs_watchers_local(struct cvs_file *); -static int watch_req = 0; -static int watch_aflags = 0; - struct cvs_cmd cvs_cmd_watch = { CVS_OP_WATCH, CVS_USE_WDIR, "watch", { { 0 }, { 0 } }, @@ -61,6 +58,8 @@ cvs_watch(int argc, char **argv) { int ch, flags; struct cvs_recursion cr; + int watch_req = 0; + int watch_aflags = 0; if (argc < 2) fatal("%s", cvs_cmd_watch.cmd_synopsis); |