diff options
-rw-r--r-- | usr.bin/cvs/add.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/admin.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/annotate.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/commit.c | 10 | ||||
-rw-r--r-- | usr.bin/cvs/diff.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/edit.c | 6 | ||||
-rw-r--r-- | usr.bin/cvs/file.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/file.h | 4 | ||||
-rw-r--r-- | usr.bin/cvs/getlog.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/import.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/remove.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/status.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/tag.c | 4 | ||||
-rw-r--r-- | usr.bin/cvs/update.c | 6 |
14 files changed, 31 insertions, 35 deletions
diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c index 2a2ac747446..d536833b4b4 100644 --- a/usr.bin/cvs/add.c +++ b/usr.bin/cvs/add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: add.c,v 1.74 2007/01/31 21:07:35 xsa Exp $ */ +/* $OpenBSD: add.c,v 1.75 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> @@ -140,7 +140,7 @@ cvs_add_local(struct cvs_file *cf) { cvs_log(LP_TRACE, "cvs_add_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 1); + cvs_file_classify(cf, NULL); /* dont use `cvs add *' */ if (strcmp(cf->file_name, ".") == 0 || diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c index fa0e2ee6210..c79a6a6d593 100644 --- a/usr.bin/cvs/admin.c +++ b/usr.bin/cvs/admin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: admin.c,v 1.47 2007/02/01 09:45:43 xsa Exp $ */ +/* $OpenBSD: admin.c,v 1.48 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Joris Vink <joris@openbsd.org> @@ -201,7 +201,7 @@ cvs_admin_local(struct cvs_file *cf) cvs_log(LP_TRACE, "cvs_admin_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cf->file_type == CVS_DIR) { if (verbosity > 1) diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c index 8f719dcae6e..403df550ff7 100644 --- a/usr.bin/cvs/annotate.c +++ b/usr.bin/cvs/annotate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: annotate.c,v 1.35 2007/01/13 20:59:49 joris Exp $ */ +/* $OpenBSD: annotate.c,v 1.36 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -109,7 +109,7 @@ cvs_annotate_local(struct cvs_file *cf) { cvs_log(LP_TRACE, "cvs_annotate_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cf->file_status == FILE_UNKNOWN || cf->file_status == FILE_UNLINK) diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 848afdc4748..7e0264cbdd3 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.103 2007/02/01 20:33:03 otto Exp $ */ +/* $OpenBSD: commit.c,v 1.104 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -149,11 +149,7 @@ cvs_commit_check_files(struct cvs_file *cf) { cvs_log(LP_TRACE, "cvs_commit_check_files(%s)", cf->file_path); - /* - * cvs_file_classify makes the noise for us - * XXX - we want that? - */ - cvs_file_classify(cf, NULL, 1); + cvs_file_classify(cf, NULL); if (cf->file_type == CVS_DIR) { if (verbosity > 1) @@ -215,7 +211,7 @@ cvs_commit_local(struct cvs_file *cf) char attic[MAXPATHLEN], repo[MAXPATHLEN], rcsfile[MAXPATHLEN]; cvs_log(LP_TRACE, "cvs_commit_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cvs_noexec == 1) return; diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 3b09f599cf6..0965e0f86c9 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.116 2007/01/26 11:19:44 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.117 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -170,7 +170,7 @@ cvs_diff_local(struct cvs_file *cf) return; } - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cf->file_status == FILE_LOST) { cvs_log(LP_ERR, "cannot find file %s", cf->file_path); diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index 79fcdb6e51b..7c8bf893b67 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.31 2007/01/25 18:56:33 otto Exp $ */ +/* $OpenBSD: edit.c,v 1.32 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006, 2007 Xavier Santolaria <xsa@openbsd.org> * @@ -261,7 +261,7 @@ cvs_edit_local(struct cvs_file *cf) cvs_log(LP_TRACE, "cvs_edit_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if ((fp = fopen(CVS_PATH_NOTIFY, "a")) == NULL) fatal("cvs_edit_local: fopen: `%s': %s", @@ -333,7 +333,7 @@ cvs_unedit_local(struct cvs_file *cf) cvs_log(LP_TRACE, "cvs_unedit_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cvs_path_cat(CVS_PATH_BASEDIR, cf->file_name, bfpath, MAXPATHLEN) >= MAXPATHLEN) diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c index 130e28ff4c6..ea0260804fb 100644 --- a/usr.bin/cvs/file.c +++ b/usr.bin/cvs/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.184 2007/02/07 23:47:56 todd Exp $ */ +/* $OpenBSD: file.c,v 1.185 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -544,7 +544,7 @@ cvs_file_freelist(struct cvs_flisthead *fl) } void -cvs_file_classify(struct cvs_file *cf, const char *tag, int loud) +cvs_file_classify(struct cvs_file *cf, const char *tag) { size_t len; struct stat st; diff --git a/usr.bin/cvs/file.h b/usr.bin/cvs/file.h index c3c037fa54b..14c172ef732 100644 --- a/usr.bin/cvs/file.h +++ b/usr.bin/cvs/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.40 2007/01/10 21:32:19 xsa Exp $ */ +/* $OpenBSD: file.h,v 1.41 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -94,7 +94,7 @@ TAILQ_HEAD(ignore_head, cvs_ignpat); void cvs_file_init(void); void cvs_file_ignore(const char *, struct ignore_head *); -void cvs_file_classify(struct cvs_file *, const char *, int); +void cvs_file_classify(struct cvs_file *, const char *); void cvs_file_free(struct cvs_file *); void cvs_file_run(int, char **, struct cvs_recursion *); void cvs_file_walklist(struct cvs_flisthead *, struct cvs_recursion *); diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c index 16845ca93fa..b42248f1147 100644 --- a/usr.bin/cvs/getlog.c +++ b/usr.bin/cvs/getlog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getlog.c,v 1.69 2007/01/11 02:35:55 joris Exp $ */ +/* $OpenBSD: getlog.c,v 1.70 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -164,7 +164,7 @@ cvs_log_local(struct cvs_file *cf) cvs_log(LP_TRACE, "cvs_log_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cf->file_status == FILE_UNKNOWN) { if (verbosity > 0) diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index f2e10d2c517..1afd72f0021 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.68 2007/02/01 11:06:25 xsa Exp $ */ +/* $OpenBSD: import.c,v 1.69 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -166,7 +166,7 @@ cvs_import_local(struct cvs_file *cf) cvs_log(LP_TRACE, "cvs_import_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cf->file_type == CVS_DIR) { if (!strcmp(cf->file_path, ".")) diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c index 18684b90dfe..a584ad50a9f 100644 --- a/usr.bin/cvs/remove.c +++ b/usr.bin/cvs/remove.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remove.c,v 1.62 2007/01/31 21:07:36 xsa Exp $ */ +/* $OpenBSD: remove.c,v 1.63 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -144,7 +144,7 @@ cvs_remove_local(struct cvs_file *cf) return; } - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cf->file_status == FILE_UNKNOWN) { if (verbosity > 1) diff --git a/usr.bin/cvs/status.c b/usr.bin/cvs/status.c index 3e5f9ced472..88ea2a6b49f 100644 --- a/usr.bin/cvs/status.c +++ b/usr.bin/cvs/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.71 2007/01/31 21:07:36 xsa Exp $ */ +/* $OpenBSD: status.c,v 1.72 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> @@ -124,7 +124,7 @@ cvs_status_local(struct cvs_file *cf) cvs_log(LP_TRACE, "cvs_status_local(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 1); + cvs_file_classify(cf, NULL); if (cf->file_type == CVS_DIR) { if (verbosity > 1) diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c index 02127dc2856..a6d474ec13d 100644 --- a/usr.bin/cvs/tag.c +++ b/usr.bin/cvs/tag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tag.c,v 1.53 2007/01/11 02:35:55 joris Exp $ */ +/* $OpenBSD: tag.c,v 1.54 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> * @@ -171,7 +171,7 @@ cvs_tag_local(struct cvs_file *cf) return; } - cvs_file_classify(cf, tag, 0); + cvs_file_classify(cf, tag); if (runflags & T_CHECK_UPTODATE) { if (cf->file_status != FILE_UPTODATE && diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c index 1ebd936ac96..f2d47082bc7 100644 --- a/usr.bin/cvs/update.c +++ b/usr.bin/cvs/update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: update.c,v 1.92 2007/01/31 21:07:36 xsa Exp $ */ +/* $OpenBSD: update.c,v 1.93 2007/02/09 03:49:15 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -145,7 +145,7 @@ cvs_update_enterdir(struct cvs_file *cf) cvs_log(LP_TRACE, "cvs_update_enterdir(%s)", cf->file_path); - cvs_file_classify(cf, NULL, 0); + cvs_file_classify(cf, NULL); if (cf->file_status == DIR_CREATE && build_dirs == 1) { cvs_mkpath(cf->file_path); @@ -285,7 +285,7 @@ cvs_update_local(struct cvs_file *cf) } flags = 0; - cvs_file_classify(cf, tag, 1); + cvs_file_classify(cf, tag); if ((cf->file_status == FILE_UPTODATE || cf->file_status == FILE_MODIFIED) && cf->file_ent != NULL && |