kill the whole __unused thing.

diff --git a/src/file.c b/src/file.c
index 35d512ae4a59a303b43f2ddf9c46923ad05a95b1..16b2998e2bab7ed55367f2202f37ec1468844de3 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -71,7 +71,7 @@
 #include "patchlevel.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: file.c,v 1.107 2007/01/25 21:05:46 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.108 2007/03/12 15:43:21 christos Exp $")
 #endif /* lint */
 
 
@@ -358,9 +358,9 @@ main(int argc, char *argv[])
 
 private void
 /*ARGSUSED*/
-load(const char *m __unused, int flags)
+load(const char *m, int flags)
 {
-       if (magic)
+       if (magic || m == NULL)
                return;
        magic = magic_open(flags);
        if (magic == NULL) {

diff --git a/src/file.h b/src/file.h
index 17d593bc8d381c700119d7e664eb37cd9622d141..83034527f43b950490b34600ff023efd9e9fa9cd 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.89 2007/03/01 22:14:54 christos Exp $
+ * @(#)$File: file.h,v 1.90 2007/03/12 15:43:21 christos Exp $
  */
 
 #ifndef __file_h__
@@ -79,14 +79,6 @@
 #endif
 #endif
 
-#ifndef __unused
-#if __GNUC_PREREQ__(2, 7)
-#define        __unused        __attribute__((__unused__))
-#else
-#define        __unused        /* delete */
-#endif
-#endif
-
 #ifndef MIN
 #define        MIN(a,b)        (((a) < (b)) ? (a) : (b))
 #endif