From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 12 Mar 2007 15:43:21 +0000 (+0000)
Subject: kill the whole __unused thing.
X-Git-Tag: FILE4_21~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00eabd3402944ae223232ded48cf7303d8b2feb6;p=file

kill the whole __unused thing.
---

diff --git a/src/file.c b/src/file.c
index 8a5706a1..ea4d177d 100644
--- a/src/file.c
+++ b/src/file.c
@@ -71,7 +71,7 @@
 #include "patchlevel.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: file.c,v 1.106 2007/01/16 14:54:57 ljt Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.107 2007/01/25 21:05:46 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 b3a4f571..cfe0b7f0 100644
--- a/src/file.h
+++ b/src/file.h
@@ -27,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$File: file.h,v 1.88 2007/02/05 16:46:40 christos Exp $
+ * @(#)$File: file.h,v 1.89 2007/03/01 22:14:54 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