remove LP_ERROR log priority level and rather use LP_ERR as they are both

the same...

ok jfb joris

8 files changed, 19 insertions, 22 deletions

diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index e1683b06a7f..d69455da7d1 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: checkout.c,v 1.26 2005/05/30 07:39:21 xsa Exp $	*/
+/*	$OpenBSD: checkout.c,v 1.27 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -170,7 +170,7 @@ cvs_checkout_pre_exec(struct cvsroot *root)
 		}
 
 		if (cvs_mkadmin(co_mods[i], root->cr_str, co_mods[i]) < 0) {
-			cvs_log(LP_ERROR, "can't create base directory '%s'",
+			cvs_log(LP_ERR, "can't create base directory '%s'",
 			    co_mods[i]);
 			return (CVS_EX_DATA);
 		}
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 6a538092b80..d5b089e0c54 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.39 2005/05/31 01:59:59 joris Exp $	*/
+/*	$OpenBSD: diff.c,v 1.40 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -639,7 +639,7 @@ cvs_diff_local(CVSFILE *cf, void *arg)
 	b1 = rcs_getrev(rf, r1);
 
 	if (b1 == NULL) {
-		cvs_log(LP_ERROR, "failed to retrieve revision %s\n",
+		cvs_log(LP_ERR, "failed to retrieve revision %s\n",
 		    rcsnum_tostr(r1, buf, sizeof(buf)));
 		if (r1 != cf->cf_lrev)
 			rcsnum_free(r1);
@@ -663,7 +663,7 @@ cvs_diff_local(CVSFILE *cf, void *arg)
 	rcs_close(rf);
 
 	if (b2 == NULL) {
-		cvs_log(LP_ERROR, "failed to retrieve revision %s\n",
+		cvs_log(LP_ERR, "failed to retrieve revision %s\n",
 		    dap->rev2);
 		cvs_buf_free(b1);
 		return (CVS_EX_DATA);
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index c0ae26ea219..44325da5564 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.81 2005/05/28 01:34:28 joris Exp $	*/
+/*	$OpenBSD: file.c,v 1.82 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -800,8 +800,7 @@ cvs_file_getdir(CVSFILE *cf, int flags, char *path, int (*cb)(CVSFILE *, void *)
 			cfp->cf_flags &= ~CVS_GDIR_IGNORE;
 
 		if (cvs_file_getdir(cfp, flags, np, cb, arg) < 0) {
-			cvs_log(LP_ERROR, "failed to get %s",
-			    CVS_FILE_NAME(cfp));
+			cvs_log(LP_ERR, "failed to get %s", CVS_FILE_NAME(cfp));
 			continue;
 		}
 	}
diff --git a/usr.bin/cvs/history.c b/usr.bin/cvs/history.c
index a7d2711d40c..99d26101771 100644
--- a/usr.bin/cvs/history.c
+++ b/usr.bin/cvs/history.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: history.c,v 1.16 2005/05/29 00:18:01 xsa Exp $	*/
+/*	$OpenBSD: history.c,v 1.17 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -216,7 +216,7 @@ cvs_history_print(struct cvs_hent *hent)
 	struct tm etime;
 
 	if (localtime_r(&(hent->ch_date), &etime) == NULL) {
-		cvs_log(LP_ERROR, "failed to convert timestamp to structure");
+		cvs_log(LP_ERR, "failed to convert timestamp to structure");
 		return;
 	}
 
diff --git a/usr.bin/cvs/log.h b/usr.bin/cvs/log.h
index 8ae533b9a1f..fbcc411f375 100644
--- a/usr.bin/cvs/log.h
+++ b/usr.bin/cvs/log.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.h,v 1.6 2005/02/15 15:29:35 jfb Exp $	*/
+/*	$OpenBSD: log.h,v 1.7 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -48,8 +48,7 @@
 #define LP_NOTICE   2
 #define LP_WARNING  3
 #define LP_WARN     LP_WARNING
-#define LP_ERROR    4
-#define LP_ERR      LP_ERROR
+#define LP_ERR      4
 #define LP_ALERT    5
 #define LP_ERRNO    6
 #define LP_ABORT    7
diff --git a/usr.bin/cvs/release.c b/usr.bin/cvs/release.c
index 4bf803a92a3..b4bcc8d6faf 100644
--- a/usr.bin/cvs/release.c
+++ b/usr.bin/cvs/release.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: release.c,v 1.8 2005/05/27 17:04:59 jfb Exp $	*/
+/*	$OpenBSD: release.c,v 1.9 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -188,7 +188,7 @@ cvs_release_dir(CVSFILE *cdir, void *arg)
 
 			/* XXX we should try to avoid a new connection ... */
 			if ((fp = popen(updcmd, "r")) == NULL) {
-				cvs_log(LP_ERROR, "cannot run command `%s'",
+				cvs_log(LP_ERR, "cannot run command `%s'",
 				    updcmd);
 				return (CVS_EX_DATA);
 			}
@@ -200,7 +200,7 @@ cvs_release_dir(CVSFILE *cdir, void *arg)
 			}
 
 			if (pclose(fp) != 0) {
-				cvs_log(LP_ERROR, "unable to release `%s'",
+				cvs_log(LP_ERR, "unable to release `%s'",
 				    dpath);
 				return (CVS_EX_DATA);
 			}
diff --git a/usr.bin/cvs/req.c b/usr.bin/cvs/req.c
index 15ccf555ec5..0b65d7bdaf4 100644
--- a/usr.bin/cvs/req.c
+++ b/usr.bin/cvs/req.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: req.c,v 1.18 2005/05/30 08:13:15 joris Exp $	*/
+/*	$OpenBSD: req.c,v 1.19 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -278,7 +278,7 @@ cvs_req_directory(int reqid, char *line)
 
 	cvs_req_currentdir = strdup(rdir);
 	if (cvs_req_currentdir == NULL) {
-		cvs_log(LP_ERROR, "failed to duplicate directory");
+		cvs_log(LP_ERR, "failed to duplicate directory");
 		return (-1);
 	}
 
@@ -352,7 +352,7 @@ cvs_req_filestate(int reqid, char *line)
 
 		/* write the file */
 		if (cvs_buf_write(fdata, fpath, fmode) < 0) {
-			cvs_log(LP_ERROR, "failed to create file %s", fpath);
+			cvs_log(LP_ERR, "failed to create file %s", fpath);
 			cvs_buf_free(fdata);
 			return (-1);
 		}
diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index 18dab224416..67699f970a6 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tag.c,v 1.19 2005/05/29 00:55:10 xsa Exp $	*/
+/*	$OpenBSD: tag.c,v 1.20 2005/05/31 08:26:40 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
@@ -151,8 +151,7 @@ cvs_tag_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg)
 		tag_date = NULL;
 
 	if (tag_oldname != NULL && tag_date != NULL) {
-		cvs_log(LP_ERROR,
-		    "the -D and -r options are mutually exclusive");
+		cvs_log(LP_ERR, "the -D and -r options are mutually exclusive");
 		return (CVS_EX_USAGE);
 	}