From bc5daab16a8b62581081d7decd140c5ba6f2bd9c Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Fri, 26 Aug 2016 04:19:28 +0000
Subject: [PATCH] pat_rep.h is only used by pat_rep.c; merge it into the .c
 file <sys/time.h>, <errno.h> and <unistd.h> are unnecessary; sort #includes

---
 bin/pax/pat_rep.c | 23 +++++++++++++++-------
 bin/pax/pat_rep.h | 49 -----------------------------------------------
 2 files changed, 16 insertions(+), 56 deletions(-)
 delete mode 100644 bin/pax/pat_rep.h

diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 077d1e5b103..8b3d9efc2ab 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pat_rep.c,v 1.40 2015/11/17 19:01:34 mmcc Exp $	*/
+/*	$OpenBSD: pat_rep.c,v 1.41 2016/08/26 04:19:28 guenther Exp $	*/
 /*	$NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $	*/
 
 /*-
@@ -35,18 +35,27 @@
  */
 
 #include <sys/types.h>
-#include <sys/time.h>
 #include <sys/stat.h>
+#include <regex.h>
 #include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <regex.h>
+#include <string.h>
+
 #include "pax.h"
-#include "pat_rep.h"
 #include "extern.h"
 
+/*
+ * data structure for storing user supplied replacement strings (-s)
+ */
+typedef struct replace {
+	char		*nstr;	/* the new string we will substitute with */
+	regex_t		rcmp;	/* compiled regular expression used to match */
+	int		flgs;	/* print conversions? global in operation?  */
+#define	PRNT		0x1
+#define	GLOB		0x2
+	struct replace	*fow;	/* pointer to next pattern */
+} REPLACE;
+
 /*
  * routines to handle pattern matching, name modification (regular expression
  * substitution and interactive renames), and destination name modification for
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
deleted file mode 100644
index adef65f2c03..00000000000
--- a/bin/pax/pat_rep.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$OpenBSD: pat_rep.h,v 1.4 2003/06/02 23:32:08 millert Exp $	*/
-/*	$NetBSD: pat_rep.h,v 1.3 1995/03/21 09:07:35 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1992 Keith Muller.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Keith Muller of the University of California, San Diego.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- */
-
-/*
- * data structure for storing user supplied replacement strings (-s)
- */
-typedef struct replace {
-	char		*nstr;	/* the new string we will substitute with */
-	regex_t		rcmp;	/* compiled regular expression used to match */
-	int		flgs;	/* print conversions? global in operation?  */
-#define	PRNT		0x1
-#define	GLOB		0x2
-	struct replace	*fow;	/* pointer to next pattern */
-} REPLACE;
-- 
2.20.1