From 2e2033cf43a1caf25905e74eb68e149ee122c988 Mon Sep 17 00:00:00 2001
From: Joris Vink <joris@cvs.openbsd.org>
Date: Tue, 7 Jun 2005 09:06:16 +0000
Subject: remove ancient and unused CVS define. it was a leftover from the
 daemon.

ok xsa@
---
 usr.bin/cvs/Makefile |  3 +--
 usr.bin/cvs/cvs.h    |  6 +-----
 usr.bin/cvs/log.c    | 13 ++-----------
 3 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/cvs/Makefile b/usr.bin/cvs/Makefile
index 7f2b58942eb..52c3c72f90b 100644
--- a/usr.bin/cvs/Makefile
+++ b/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2005/05/24 04:12:25 jfb Exp $
+#	$OpenBSD: Makefile,v 1.9 2005/06/07 09:06:15 joris Exp $
 
 PROG=	cvs
 MAN=	cvs.1 cvsrc.5 cvsintro.7
@@ -21,7 +21,6 @@ CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS+= -Wmissing-declarations
 CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
 CFLAGS+= -Wsign-compare
-CFLAGS+= -DCVS
 YFLAGS=
 
 INSTALL_STRIP=
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index a5dcf944c6e..e1728957e05 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.h,v 1.64 2005/06/01 17:44:34 joris Exp $	*/
+/*	$OpenBSD: cvs.h,v 1.65 2005/06/07 09:06:15 joris Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -290,8 +290,6 @@ typedef struct cvs_histfile {
 } CVSHIST;
 
 
-#ifdef CVS
-
 extern char *cvs_repo_base;
 extern char *cvs_command;
 extern char *cvs_editor;
@@ -309,8 +307,6 @@ extern int  cvs_readonly;
 
 extern CVSFILE *cvs_files;
 
-#endif
-
 extern struct cvs_cmd *cvs_cdt[];
 
 extern struct cvs_cmd cvs_cmd_add;
diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c
index 32561ec0e02..4b8b3b7ad57 100644
--- a/usr.bin/cvs/log.c
+++ b/usr.bin/cvs/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.19 2005/06/05 20:47:44 joris Exp $	*/
+/*	$OpenBSD: log.c,v 1.20 2005/06/07 09:06:15 joris Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -205,6 +205,7 @@ cvs_vlog(u_int level, const char *fmt, va_list vap)
 	int ecp;
 	char prefix[64], buf[1024], ebuf[32];
 	FILE *out;
+	struct cvs_cmd *cmdp;
 
 	if (level > LP_MAX)
 		return (-1);
@@ -218,9 +219,6 @@ cvs_vlog(u_int level, const char *fmt, va_list vap)
 	else
 		ecp = 0;
 
-#ifdef CVS
-	struct cvs_cmd *cmdp;
-
 	/* always use the command name in error messages, not aliases */
 	cmdp = cvs_findcmd(cvs_command);
 
@@ -237,7 +235,6 @@ cvs_vlog(u_int level, const char *fmt, va_list vap)
 			snprintf(prefix, sizeof(prefix), "%s %s", __progname,
 			    cmdp->cmd_name);
 	} else /* just use the standard strlcpy */
-#endif
 		strlcpy(prefix, __progname, sizeof(prefix));
 
 	if ((cvs_log_flags & LF_PID) && (level != LP_TRACE)) {
@@ -257,7 +254,6 @@ cvs_vlog(u_int level, const char *fmt, va_list vap)
 		else
 			out = stderr;
 
-#ifdef CVS
 		if (cvs_cmdop == CVS_OP_SERVER) {
 			if (out == stdout)
 				putc('M', out);
@@ -267,7 +263,6 @@ cvs_vlog(u_int level, const char *fmt, va_list vap)
 			}
 			putc(' ', out);
 		}
-#endif
 
 		fputs(prefix, out);
 		if (level != LP_TRACE)
@@ -287,7 +282,6 @@ cvs_vlog(u_int level, const char *fmt, va_list vap)
 }
 
 
-#ifdef CVS
 /*
  * cvs_printf()
  *
@@ -336,7 +330,6 @@ cvs_printf(const char *fmt, ...)
 	va_end(vap);
 	return (ret);
 }
-
 void
 cvs_putchar(int c)
 {
@@ -351,5 +344,3 @@ cvs_putchar(int c)
 	if (cvs_cmdop == CVS_OP_SERVER && c == '\n')
 		send_m = 1;
 }
-
-#endif
-- 
cgit v1.2.3