From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 17 Apr 2009 06:37:41 +0000 (-0400)
Subject: Eliminate a bunch of preprocessor symbols that aren't actually
X-Git-Tag: v2.8.0~697
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=460400fde4fcd518b37545967aae3e934568acdb;p=thirdparty%2Flibarchive.git

Eliminate a bunch of preprocessor symbols that aren't actually
used anywhere in cpio.

SVN-Revision: 1024
---

diff --git a/cpio/config_freebsd.h b/cpio/config_freebsd.h
index 2add4af4d..f676cf2c9 100644
--- a/cpio/config_freebsd.h
+++ b/cpio/config_freebsd.h
@@ -25,83 +25,26 @@
  * $FreeBSD: src/usr.bin/cpio/config_freebsd.h,v 1.3 2008/12/06 07:30:40 kientzle Exp $
  */
 
-/* A default configuration for FreeBSD, used if there is no config.h. */
+/* A hand-tooled configuration for FreeBSD. */
 
 #include <sys/param.h>  /* __FreeBSD_version */
 
-#if __FreeBSD__ > 4
-#define	HAVE_ACL_GET_PERM 0
-#define	HAVE_ACL_GET_PERM_NP 1
-#define	HAVE_ACL_PERMSET_T 1
-#define	HAVE_ACL_USER 1
-#endif
-#undef	HAVE_ATTR_XATTR_H
-#define	HAVE_BZLIB_H 1
-#define	HAVE_CHFLAGS 1
-#define	HAVE_DECL_OPTARG 1
-#define	HAVE_DECL_OPTIND 1
-#define	HAVE_DIRENT_D_NAMLEN 1
-#define	HAVE_DIRENT_H 1
-#define	HAVE_D_MD_ORDER 1
 #define	HAVE_ERRNO_H 1
-#undef	HAVE_EXT2FS_EXT2_FS_H
-#define	HAVE_FCHDIR 1
 #define	HAVE_FCNTL_H 1
-#define	HAVE_FNMATCH 1
-#define	HAVE_FNMATCH_H 1
-#define	HAVE_FNM_LEADING_DIR 1
-#define	HAVE_FTRUNCATE 1
 #define	HAVE_FUTIMES 1
-#undef	HAVE_GETXATTR
 #define	HAVE_GRP_H 1
-#define	HAVE_INTTYPES_H 1
-#define	HAVE_LANGINFO_H 1
-#undef	HAVE_LGETXATTR
-#undef	HAVE_LIBACL
 #define	HAVE_LIBARCHIVE 1
-#define	HAVE_LIBBZ2 1
-#define	HAVE_LIBZ 1
-#define	HAVE_LIMITS_H 1
-#undef	HAVE_LINUX_EXT2_FS_H
-#undef	HAVE_LINUX_FS_H
-#undef	HAVE_LISTXATTR
-#undef	HAVE_LLISTXATTR
-#define	HAVE_LOCALE_H 1
 #define	HAVE_LUTIMES 1
-#define	HAVE_MALLOC 1
-#define	HAVE_MEMMOVE 1
-#define	HAVE_MEMORY_H 1
-#define	HAVE_MEMSET 1
-#if __FreeBSD_version >= 450002 /* nl_langinfo introduced */
-#define	HAVE_NL_LANGINFO 1
-#endif
-#define	HAVE_PATHS_H 1
 #define	HAVE_PWD_H 1
-#define	HAVE_SETLOCALE 1
 #define	HAVE_STDARG_H 1
-#define	HAVE_STDINT_H 1
 #define	HAVE_STDLIB_H 1
-#define	HAVE_STRCHR 1
-#define	HAVE_STRDUP 1
-#define	HAVE_STRERROR 1
-#define	HAVE_STRFTIME 1
-#define	HAVE_STRINGS_H 1
 #define	HAVE_STRING_H 1
-#define	HAVE_STRRCHR 1
-#undef	HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
-#define	HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
-#define	HAVE_SYS_ACL_H 1
-#define	HAVE_SYS_IOCTL_H 1
-#define	HAVE_SYS_PARAM_H 1
+#undef	HAVE_SYS_MKDEV_H
 #define	HAVE_SYS_STAT_H 1
+#define	HAVE_SYS_TIME_H 1
 #define	HAVE_TIME_H 1
-#define	HAVE_SYS_TYPES_H 1
 #define	HAVE_UINTMAX_T 1
 #define	HAVE_UNISTD_H 1
 #define	HAVE_UNSIGNED_LONG_LONG 1
 #define	HAVE_UTIMES 1
-#define	HAVE_VPRINTF 1
-#define	HAVE_ZLIB_H 1
-#undef	MAJOR_IN_MKDEV
-#define	STDC_HEADERS 1
 
diff --git a/cpio/cpio.h b/cpio/cpio.h
index 79b222331..bbadfe206 100644
--- a/cpio/cpio.h
+++ b/cpio/cpio.h
@@ -31,8 +31,6 @@
 #include "cpio_platform.h"
 #include <stdio.h>
 
-#define	DEFAULT_BYTES_PER_BLOCK	(20*512)
-
 /*
  * The internal state for the "cpio" program.
  *
diff --git a/cpio/cpio_platform.h b/cpio/cpio_platform.h
index 8ade73130..1ed8986fa 100644
--- a/cpio/cpio_platform.h
+++ b/cpio/cpio_platform.h
@@ -37,13 +37,10 @@
 #if defined(PLATFORM_CONFIG_H)
 /* Use hand-built config.h in environments that need it. */
 #include PLATFORM_CONFIG_H
-#elif defined(HAVE_CONFIG_H)
-/* Most POSIX platforms use the 'configure' script to build config.h */
-#include "config.h"
 #else
-/* Warn if cpio hasn't been (automatically or manually) configured. */
-#error Oops: No config.h and no built-in configuration in cpio_platform.h.
-#endif /* !HAVE_CONFIG_H */
+/* Read config.h or die trying. */
+#include "config.h"
+#endif
 
 /* No non-FreeBSD platform will have __FBSDID, so just define it here. */
 #ifdef __FreeBSD__