fix include files.

diff --git a/src/apprentice.c b/src/apprentice.c
index e706af80cf695078a35d974d940dd8b1b8179252..39d30caf559bbd9d5a6a30132528237c6f2f130a 100644 (file)
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.146 2008/11/07 18:57:08 christos Exp $")
+FILE_RCSID("@(#)$File: apprentice.c,v 1.147 2009/02/03 20:27:51 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -45,12 +45,9 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.146 2008/11/07 18:57:08 christos Exp $")
 #include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/param.h>
 #ifdef QUICK
 #include <sys/mman.h>
 #endif
-#include <sys/types.h>
 #include <dirent.h>
 
 #define        EATAB {while (isascii((unsigned char) *l) && \

diff --git a/src/apptype.c b/src/apptype.c
index 83e7f21e3c61b238fecf7f3dad4d0a6d4ad71ceb..6f171ad1e0a498412a31ee35b0fd4b2778b28eba 100644 (file)
--- a/src/apptype.c
+++ b/src/apptype.c
@@ -27,10 +27,9 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: apptype.c,v 1.9 2008/11/04 16:38:28 christos Exp $")
+FILE_RCSID("@(#)$File: apptype.c,v 1.10 2009/02/03 20:27:51 christos Exp $")
 #endif /* lint */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/ascmagic.c b/src/ascmagic.c
index b733e786b343117a3f166eab052e8cdc9a469343..9236fb4a27a3369dcd294e955d37f895d2c52812 100644 (file)
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -36,11 +36,10 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: ascmagic.c,v 1.74 2008/11/07 19:10:25 christos Exp $")
+FILE_RCSID("@(#)$File: ascmagic.c,v 1.75 2009/02/03 20:27:51 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
-#include <stdio.h>
 #include <string.h>
 #include <memory.h>
 #include <ctype.h>

diff --git a/src/asprintf.c b/src/asprintf.c
index aadddbb61de63cabc91e728f77b43c005f39b801..0606593ed3b62189c70ea495a6fc855bec3e0559 100644 (file)
--- a/src/asprintf.c
+++ b/src/asprintf.c
@@ -29,11 +29,9 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: asprintf.c,v 1.2 2008/11/04 16:38:28 christos Exp $")
+FILE_RCSID("@(#)$File: asprintf.c,v 1.3 2009/02/03 20:27:51 christos Exp $")
 #endif
 
-#include <stdarg.h>
-
 int vasprintf(char **ptr, const char *format_string, va_list vargs);
 
 int asprintf(char **ptr, const char *fmt, ...)

diff --git a/src/cdf.c b/src/cdf.c
index ef8d139e63250040c37c6f1399d12de3881509e8..0c66d11bdb124023074b5010a9d814c457033b8c 100644 (file)
--- a/src/cdf.c
+++ b/src/cdf.c
@@ -32,27 +32,18 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: cdf.c,v 1.16 2008/12/12 20:53:02 christos Exp $")
+FILE_RCSID("@(#)$File: cdf.c,v 1.17 2009/02/03 20:27:51 christos Exp $")
 #endif
 
 #include <assert.h>
-#include <stdio.h>
 #ifdef CDF_DEBUG
 #include <err.h>
 #endif
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
 
 #ifndef EFTYPE
 #define EFTYPE EINVAL

diff --git a/src/cdf_time.c b/src/cdf_time.c
index 2ce199a0db6f17b75a4f882e6c8ed489ad868802..e531b2dee7166a0c8d1162cb65c2d2e69f7da07d 100644 (file)
--- a/src/cdf_time.c
+++ b/src/cdf_time.c
@@ -27,23 +27,14 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: cdf_time.c,v 1.4 2008/11/04 16:38:28 christos Exp $")
+FILE_RCSID("@(#)$File: cdf_time.c,v 1.5 2009/02/03 20:27:51 christos Exp $")
 #endif
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <time.h>
 #ifdef TEST
 #include <err.h>
 #endif
 #include <string.h>
-#include <errno.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
 
 #include "cdf.h"
 

diff --git a/src/compress.c b/src/compress.c
index 2f00e188da666495ca99dcd8d0f02c7583cbca91..0a30803c40d9bc10fad2ede283e0ecbccc9448d7 100644 (file)
--- a/src/compress.c
+++ b/src/compress.c
@@ -35,18 +35,16 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: compress.c,v 1.60 2008/11/27 22:16:54 christos Exp $")
+FILE_RCSID("@(#)$File: compress.c,v 1.61 2009/02/03 20:27:51 christos Exp $")
 #endif
 
 #include "magic.h"
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <string.h>
 #include <errno.h>
-#include <sys/types.h>
 #include <sys/ioctl.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>

diff --git a/src/encoding.c b/src/encoding.c
index 8a1a634ae0ec04263b36556486693efa089aa66a..4e94f9b868f0a373860a883142b63afaf8882fab 100644 (file)
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -33,14 +33,16 @@
  */
 
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: encoding.c,v 1.3 2009/02/03 20:27:51 christos Exp $")
+#endif /* lint */
+
 #include "magic.h"
 #include <string.h>
 #include <memory.h>
 #include <stdlib.h>
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: encoding.c,v 1.2 2008/11/06 22:49:08 rrt Exp $")
-#endif /* lint */
 
 private int looks_ascii(const unsigned char *, size_t, unichar *, size_t *);
 private int looks_utf8_with_BOM(const unsigned char *, size_t, unichar *,

diff --git a/src/file.c b/src/file.c
index 66c40fe8645329ca3a93c27f4dbcb3c5a659cd66..9b4747b2ec6d29706c3861a72fce8b33b7c2ab1b 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -32,18 +32,14 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: file.c,v 1.129 2008/12/03 18:05:18 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.130 2009/02/03 20:27:51 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/param.h> /* for MAXPATHLEN */
-#include <sys/stat.h>
 #ifdef RESTORE_TIME
 # if (__COHERENT__ >= 0x420)
 #  include <sys/utime.h>

diff --git a/src/file.h b/src/file.h
index 65522c0bc2944aaf60e226639d19371182eac853..204f49871380e270366eb46a1e6c0648987122f3 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -27,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$File: file.h,v 1.117 2008/11/22 17:01:28 chl Exp $
+ * @(#)$File: file.h,v 1.118 2009/02/03 20:27:51 christos Exp $
  */
 
 #ifndef __file_h__
@@ -48,6 +48,7 @@
 #endif
 #include <regex.h>
 #include <sys/types.h>
+#include <sys/param.h>
 /* Do this here and now, because struct stat gets re-defined on solaris */
 #include <sys/stat.h>
 #include <stdarg.h>

diff --git a/src/fsmagic.c b/src/fsmagic.c
index 4a23410e9a534ed994f2f9c80db98583d0007157..a68cd109f79ec8f2835857ce17748b90ba86c8ec 100644 (file)
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: fsmagic.c,v 1.58 2008/11/22 17:01:28 chl Exp $")
+FILE_RCSID("@(#)$File: fsmagic.c,v 1.59 2009/02/03 20:27:51 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -41,7 +41,6 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.58 2008/11/22 17:01:28 chl Exp $")
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <sys/stat.h>
 /* Since major is a function on SVR4, we cannot use `ifndef major'.  */
 #ifdef MAJOR_IN_MKDEV
 # include <sys/mkdev.h>

diff --git a/src/getopt_long.c b/src/getopt_long.c
index 97de4c3bfd2ca87a9a648d40c949c28cf8ba2213..2ad5b4de0a8d63b69351655e7ce2818dbeba9d47 100644 (file)
--- a/src/getopt_long.c
+++ b/src/getopt_long.c
@@ -32,14 +32,13 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: getopt_long.c,v 1.4 2008/11/04 16:38:28 christos Exp $")
+FILE_RCSID("@(#)$File: getopt_long.c,v 1.5 2009/02/03 20:27:51 christos Exp $")
 #endif /* lint */
 
 #include <assert.h>
 #ifdef HAVE_ERR_H
 #include <err.h>
 #else
-#include <stdio.h>
 #define warnx printf
 #endif
 #include <errno.h>

diff --git a/src/is_tar.c b/src/is_tar.c
index 3fb5cc5e7872936689896af16540d94feade8620..f962edbd8ee345d61ae01c0b5779d197682224e1 100644 (file)
--- a/src/is_tar.c
+++ b/src/is_tar.c
@@ -40,13 +40,12 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: is_tar.c,v 1.35 2008/11/07 18:57:28 christos Exp $")
+FILE_RCSID("@(#)$File: is_tar.c,v 1.36 2009/02/03 20:27:51 christos Exp $")
 #endif
 
 #include "magic.h"
 #include <string.h>
 #include <ctype.h>
-#include <sys/types.h>
 #include "tar.h"
 
 #define        isodigit(c)     ( ((c) >= '0') && ((c) <= '7') )

diff --git a/src/magic.c b/src/magic.c
index daaa75a59a1063b68bbcba8383d1249e119f00f9..26b7b864d832fecf397b4d608727d6b4ad315628 100644 (file)
--- a/src/magic.c
+++ b/src/magic.c
@@ -28,18 +28,14 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: magic.c,v 1.58 2009/01/12 20:15:11 christos Exp $")
+FILE_RCSID("@(#)$File: magic.c,v 1.59 2009/02/03 20:27:51 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/param.h> /* for MAXPATHLEN */
-#include <sys/stat.h>
 #ifdef QUICK
 #include <sys/mman.h>
 #endif

diff --git a/src/print.c b/src/print.c
index ced93164cce6d9880f9e7f5026f140ebbc335199..d44a5b3b1be824f053a28af88ac9d41e0ca09daf 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -32,11 +32,9 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: print.c,v 1.65 2008/11/04 16:38:28 christos Exp $")
+FILE_RCSID("@(#)$File: print.c,v 1.66 2009/02/03 20:27:51 christos Exp $")
 #endif  /* lint */
 
-#include <stdio.h>
-#include <errno.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/src/readcdf.c b/src/readcdf.c
index 1bd4cb8b0ece567affa06c9a60b9f7a6abe175fb..27031dbd9dd3d29f94e5e14773ea6b19bb07bb8a 100644 (file)
--- a/src/readcdf.c
+++ b/src/readcdf.c
@@ -26,14 +26,11 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: readcdf.c,v 1.10 2008/12/03 22:54:02 christos Exp $")
+FILE_RCSID("@(#)$File: readcdf.c,v 1.11 2009/02/03 20:27:51 christos Exp $")
 #endif
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <string.h>
 #include <time.h>
 #include <ctype.h>

diff --git a/src/vasprintf.c b/src/vasprintf.c
index 3ca63a3a1bf8abc39ba123f2fd94eca02026cc37..3e3af2062a85e04d93a353b157cc6f42ae4c7683 100644 (file)
--- a/src/vasprintf.c
+++ b/src/vasprintf.c
@@ -108,11 +108,10 @@ you use strange formats.
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: vasprintf.c,v 1.6 2008/11/04 16:38:28 christos Exp $")
+FILE_RCSID("@(#)$File: vasprintf.c,v 1.7 2009/02/03 20:27:52 christos Exp $")
 #endif /* lint */
 
 #include <assert.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>