From 6fd9edc57c7e711d18c778faabd7c451ff0a32ab Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Mon, 14 Jul 2014 05:58:19 +0000
Subject: [PATCH] Delete pointless 'return;' at end of function

---
 bin/pax/buf_subs.c  |  4 +--
 bin/pax/cache.h     | 73 ---------------------------------------------
 bin/pax/file_subs.c |  8 +----
 bin/pax/gen_subs.c  |  4 +--
 bin/pax/tables.c    |  5 +---
 5 files changed, 4 insertions(+), 90 deletions(-)
 delete mode 100644 bin/pax/cache.h

diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index d61043cc870..1ba152b3432 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf_subs.c,v 1.24 2012/12/04 02:24:45 deraadt Exp $	*/
+/*	$OpenBSD: buf_subs.c,v 1.25 2014/07/14 05:58:19 guenther Exp $	*/
 /*	$NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $	*/
 
 /*-
@@ -373,7 +373,6 @@ pback(char *pt, int cnt)
 {
 	bufpt -= cnt;
 	memcpy(bufpt, pt, cnt);
-	return;
 }
 
 /*
@@ -816,7 +815,6 @@ cp_file(ARCHD *arcn, int fd1, int fd2)
 	 */
 	if (!no_hole && isem && (arcn->sb.st_size > 0L))
 		file_flush(fd2, fnm, isem);
-	return;
 }
 
 /*
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
deleted file mode 100644
index 5c7b9b8b5f3..00000000000
--- a/bin/pax/cache.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$OpenBSD: cache.h,v 1.4 2003/10/20 06:22:27 jmc Exp $	*/
-/*	$NetBSD: cache.h,v 1.3 1995/03/21 09:07:12 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.
- *
- *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- */
-
-/*
- * Constants and data structures used to implement group and password file
- * caches. Traditional passwd/group cache routines perform quite poorly with
- * archives. The chances of hitting a valid lookup with an archive is quite a
- * bit worse than with files already resident on the file system. These misses
- * create a MAJOR performance cost. To address this problem, these routines
- * cache both hits and misses.
- *
- * NOTE:  name lengths must be as large as those stored in ANY PROTOCOL and
- * as stored in the passwd and group files. CACHE SIZES MUST BE PRIME
- */
-#define UNMLEN		32	/* >= user name found in any protocol */
-#define GNMLEN		32	/* >= group name found in any protocol */
-#define UID_SZ		317	/* size of user_name/uid cache */
-#define UNM_SZ		317	/* size of user_name/uid cache */
-#define GID_SZ		251	/* size of gid cache */
-#define GNM_SZ		317	/* size of group name cache */
-#define VALID		1	/* entry and name are valid */
-#define INVALID		2	/* entry valid, name NOT valid */
-
-/*
- * Node structures used in the user, group, uid, and gid caches.
- */
-
-typedef struct uidc {
-	int valid;		/* is this a valid or a miss entry */
-	char name[UNMLEN];	/* uid name */
-	uid_t uid;		/* cached uid */
-} UIDC;
-
-typedef struct gidc {
-	int valid;		/* is this a valid or a miss entry */
-	char name[GNMLEN];	/* gid name */
-	gid_t gid;		/* cached gid */
-} GIDC;
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index a9ea6cd5da5..016c17a26f2 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file_subs.c,v 1.35 2014/01/14 02:55:09 guenther Exp $	*/
+/*	$OpenBSD: file_subs.c,v 1.36 2014/07/14 05:58:19 guenther Exp $	*/
 /*	$NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $	*/
 
 /*-
@@ -675,7 +675,6 @@ set_ftime(char *fnm, time_t mtime, time_t atime, int frc)
 	if (utimensat(AT_FDCWD, fnm, tv, AT_SYMLINK_NOFOLLOW) < 0)
 		syswarn(1, errno, "Access/modification time set failed on: %s",
 		    fnm);
-	return;
 }
 
 void
@@ -703,7 +702,6 @@ fset_ftime(char *fnm, int fd, time_t mtime, time_t atime, int frc)
 	if (futimens(fd, tv) < 0)
 		syswarn(1, errno, "Access/modification time set failed on: %s",
 		    fnm);
-	return;
 }
 
 /*
@@ -758,7 +756,6 @@ set_pmode(char *fnm, mode_t mode)
 	mode &= ABITS;
 	if (fchmodat(AT_FDCWD, fnm, mode, AT_SYMLINK_NOFOLLOW) < 0)
 		syswarn(1, errno, "Could not set permissions on %s", fnm);
-	return;
 }
 
 void
@@ -767,7 +764,6 @@ fset_pmode(char *fnm, int fd, mode_t mode)
 	mode &= ABITS;
 	if (fchmod(fd, mode) < 0)
 		syswarn(1, errno, "Could not set permissions on %s", fnm);
-	return;
 }
 
 /*
@@ -945,7 +941,6 @@ file_flush(int fd, char *fname, int isempt)
 
 	if (write(fd, blnk, 1) < 0)
 		syswarn(1, errno, "Failed write to file %s", fname);
-	return;
 }
 
 /*
@@ -972,7 +967,6 @@ rdfile_close(ARCHD *arcn, int *fd)
 	 * user wants last access time reset
 	 */
 	set_ftime(arcn->org_name, arcn->sb.st_mtime, arcn->sb.st_atime, 1);
-	return;
 }
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index d2e3c72a43e..29330efaba6 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gen_subs.c,v 1.25 2014/01/09 03:12:25 guenther Exp $	*/
+/*	$OpenBSD: gen_subs.c,v 1.26 2014/07/14 05:58:19 guenther Exp $	*/
 /*	$NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $	*/
 
 /*-
@@ -133,7 +133,6 @@ ls_list(ARCHD *arcn, time_t now, FILE *fp)
 	}
 	(void)putc(term, fp);
 	(void)fflush(fp);
-	return;
 }
 
 /*
@@ -156,7 +155,6 @@ ls_tty(ARCHD *arcn)
 		f_date[0] = '\0';
 	strmode(arcn->sb.st_mode, f_mode);
 	tty_prnt("%s%s %s\n", f_mode, f_date, arcn->name);
-	return;
 }
 
 void
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 9e8f886e463..fb9f028e5fb 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tables.c,v 1.34 2014/05/24 18:51:00 guenther Exp $	*/
+/*	$OpenBSD: tables.c,v 1.35 2014/07/14 05:58:19 guenther Exp $	*/
 /*	$NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $	*/
 
 /*-
@@ -292,7 +292,6 @@ lnk_end(void)
 			free(ppt);
 		}
 	}
-	return;
 }
 
 /*
@@ -607,7 +606,6 @@ sub_name(char *oname, int *onamelen, size_t onamesize)
 	/*
 	 * no match, just return
 	 */
-	return;
 }
 
 /*
@@ -1004,7 +1002,6 @@ add_atdir(char *fname, dev_t dev, ino_t ino, time_t mtime, time_t atime)
 
 	sigprocmask(SIG_SETMASK, &savedsigs, NULL);
 	paxwarn(1, "Directory access time reset table ran out of memory");
-	return;
 }
 
 /*
-- 
2.20.1