From 8790116d853df63c3b5cdfc875d79bed9e8339e5 Mon Sep 17 00:00:00 2001
From: Xavier Santolaria <xsa@cvs.openbsd.org>
Date: Thu, 5 Jan 2006 10:28:25 +0000
Subject: cleanup, move log.h and rcs.h inclusion into rcsprog.h;

---
 usr.bin/rcs/ci.c       | 6 ++----
 usr.bin/rcs/co.c       | 4 +---
 usr.bin/rcs/ident.c    | 4 +---
 usr.bin/rcs/rcsclean.c | 6 ++----
 usr.bin/rcs/rcsdiff.c  | 6 ++----
 usr.bin/rcs/rcsmerge.c | 6 ++----
 usr.bin/rcs/rcsprog.c  | 4 +---
 usr.bin/rcs/rcsprog.h  | 4 +++-
 usr.bin/rcs/rlog.c     | 6 ++----
 9 files changed, 16 insertions(+), 30 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index 9a499658823..e0e7293827e 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ci.c,v 1.91 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: ci.c,v 1.92 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
  * All rights reserved.
@@ -26,10 +26,8 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
-#include "diff.h"
 #include "rcsprog.h"
+#include "diff.h"
 
 #define CI_OPTSTRING    "d::f::i::j::k:l::m:M::N:n:qr::s:Tt:u::Vw:x:"
 #define DATE_NOW        -1
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index fdf924a0353..954940f461f 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: co.c,v 1.51 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: co.c,v 1.52 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -26,8 +26,6 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
 #include "rcsprog.h"
 
 #define CO_OPTSTRING	"d:f::k:l::M::p::q::r::s:Tu::Vw::x:"
diff --git a/usr.bin/rcs/ident.c b/usr.bin/rcs/ident.c
index 4d5ed7f5b4a..e4abff31fe7 100644
--- a/usr.bin/rcs/ident.c
+++ b/usr.bin/rcs/ident.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ident.c,v 1.9 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: ident.c,v 1.10 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -26,8 +26,6 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
 #include "rcsprog.h"
 
 #define KEYDELIM	'$'	/* keywords delimitor */
diff --git a/usr.bin/rcs/rcsclean.c b/usr.bin/rcs/rcsclean.c
index e936add9711..675f706cf91 100644
--- a/usr.bin/rcs/rcsclean.c
+++ b/usr.bin/rcs/rcsclean.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsclean.c,v 1.22 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: rcsclean.c,v 1.23 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -26,10 +26,8 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
-#include "diff.h"
 #include "rcsprog.h"
+#include "diff.h"
 
 static int rcsclean_file(char *, RCSNUM *);
 static int nflag = 0;
diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c
index 7b2be4b6183..2cf672e1ba5 100644
--- a/usr.bin/rcs/rcsdiff.c
+++ b/usr.bin/rcs/rcsdiff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsdiff.c,v 1.29 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: rcsdiff.c,v 1.30 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -26,10 +26,8 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
-#include "diff.h"
 #include "rcsprog.h"
+#include "diff.h"
 
 static int rcsdiff_file(RCSFILE *, RCSNUM *, const char *);
 static int rcsdiff_rev(RCSFILE *, RCSNUM *, RCSNUM *, const char *);
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index 4f1384a8af6..e0dfb55a154 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.12 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.13 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -26,10 +26,8 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
-#include "diff.h"
 #include "rcsprog.h"
+#include "diff.h"
 
 static int kflag = RCS_KWEXP_ERR;
 
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c
index 30314fe4fa8..2633b3e3bf2 100644
--- a/usr.bin/rcs/rcsprog.c
+++ b/usr.bin/rcs/rcsprog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsprog.c,v 1.59 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: rcsprog.c,v 1.60 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -26,8 +26,6 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
 #include "rcsprog.h"
 
 #define RCS_CMD_MAXARG	128
diff --git a/usr.bin/rcs/rcsprog.h b/usr.bin/rcs/rcsprog.h
index c62bc7d57aa..349523e93f3 100644
--- a/usr.bin/rcs/rcsprog.h
+++ b/usr.bin/rcs/rcsprog.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsprog.h,v 1.32 2005/12/23 00:59:56 joris Exp $	*/
+/*	$OpenBSD: rcsprog.h,v 1.33 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -27,6 +27,8 @@
 #ifndef RCSPROG_H
 #define RCSPROG_H
 
+#include "log.h"
+#include "rcs.h"
 #include "xmalloc.h"
 
 #define RCS_TMPDIR_DEFAULT	"/tmp"
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c
index 83ca7fbf8db..9c55bcdf744 100644
--- a/usr.bin/rcs/rlog.c
+++ b/usr.bin/rcs/rlog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlog.c,v 1.18 2006/01/02 08:13:28 xsa Exp $	*/
+/*	$OpenBSD: rlog.c,v 1.19 2006/01/05 10:28:24 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -26,10 +26,8 @@
 
 #include "includes.h"
 
-#include "log.h"
-#include "rcs.h"
-#include "diff.h"
 #include "rcsprog.h"
+#include "diff.h"
 
 static int	rlog_file(const char *, const char *, RCSFILE *);
 static void	rlog_rev_print(RCSFILE *);
-- 
cgit v1.2.3