Add __unused to rcsids

diff --git a/alias.c b/alias.c
index da6895cf9a74bb5bc42a1981c55651c688f8cbdd..b69c0bd9891da4a762858d8742db59449a88f1bb 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -49,7 +49,7 @@
 #include "redblack.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/alloc.c b/alloc.c
index 4697d9245aaf64c2ed75ea52ad5eaaba4b3d02f0..8b2b6dc56454c7cc5c2f1afeee59c9dea02e0a5b 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -45,7 +45,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/auth/afs.c b/auth/afs.c
index 7a98ff6dfd72fb08ce09dea5639e3bb9e7190ebb..3e329ae3ab31f50239068dd6737909ff1d9a0012 100644 (file)
--- a/auth/afs.c
+++ b/auth/afs.c
@@ -51,7 +51,7 @@
 #include <afs/kautils.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 int

diff --git a/auth/aix_auth.c b/auth/aix_auth.c
index 8afe4e48b3df788fcd0f7a8bafe3a6062edaf391..b5e34c03a327950b7997afa0f09aaa46f3d22bf5 100644 (file)
--- a/auth/aix_auth.c
+++ b/auth/aix_auth.c
@@ -47,7 +47,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 int

diff --git a/auth/bsdauth.c b/auth/bsdauth.c
index 3bc32175e3781dd9224b6dce10979ebb1f8deb52..3ebdcffcf61badd49431143b7c7772f6c59803aa 100644 (file)
--- a/auth/bsdauth.c
+++ b/auth/bsdauth.c
@@ -52,7 +52,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 extern char *login_style;              /* from sudo.c */

diff --git a/auth/dce.c b/auth/dce.c
index 7f4db3d9eb6bfa2b71c409a46c9e873ba7926a08..bf76c4eaf386cbdadd9ad0f5a64edcf27244cf0a 100644 (file)
--- a/auth/dce.c
+++ b/auth/dce.c
@@ -66,7 +66,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 static int check_dce_status __P((error_status_t, char *));

diff --git a/auth/fwtk.c b/auth/fwtk.c
index e9740d6fc4b66a612a16ab08db0fbd111653df83..9a7c4854e48a39d1b044d1a706d9e50ca26b7ec0 100644 (file)
--- a/auth/fwtk.c
+++ b/auth/fwtk.c
@@ -50,7 +50,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 int

diff --git a/auth/kerb4.c b/auth/kerb4.c
index f1b51994acc0b5daf3086fcad0d0bfffa9d792e8..b3c9e3b34c5080002382d991aa54d128472e94ba 100644 (file)
--- a/auth/kerb4.c
+++ b/auth/kerb4.c
@@ -48,7 +48,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 int

diff --git a/auth/kerb5.c b/auth/kerb5.c
index d1e9cd4a8f9fc5eb1d7b186d32d35fd3d845f414..1518858f4bf2e2ec2c1747ad808dd80c3af05524 100644 (file)
--- a/auth/kerb5.c
+++ b/auth/kerb5.c
@@ -51,7 +51,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 #ifdef HAVE_HEIMDAL

diff --git a/auth/pam.c b/auth/pam.c
index ca2995616d47c4ca8f2fb796bcd5afe0183cfb01..c5d20800c7241c7e4c577985817aeb5bb9ee8ab1 100644 (file)
--- a/auth/pam.c
+++ b/auth/pam.c
@@ -63,7 +63,7 @@
 #endif
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 static int sudo_conv __P((int, PAM_CONST struct pam_message **,

diff --git a/auth/passwd.c b/auth/passwd.c
index 1eeb6f23cbb63fe6faa4e635c602e1df0b05dd98..1dd73db931b99c13a169b82565ba57331de492f8 100644 (file)
--- a/auth/passwd.c
+++ b/auth/passwd.c
@@ -47,7 +47,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 #define DESLEN                 13

diff --git a/auth/rfc1938.c b/auth/rfc1938.c
index 19d815b96939758264a38c72835c6e8b405d244d..95bebbf4d4feb149fd3f2b351dfe9eb15a1e7f9c 100644 (file)
--- a/auth/rfc1938.c
+++ b/auth/rfc1938.c
@@ -64,7 +64,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 int

diff --git a/auth/secureware.c b/auth/secureware.c
index bbfaa7fbfd29cba0fa94228c137e9a1fe58e3e58..ea32e7a05c0b5b45a0463bb9c11c0fbcf8e6cd78 100644 (file)
--- a/auth/secureware.c
+++ b/auth/secureware.c
@@ -54,7 +54,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 int

diff --git a/auth/securid.c b/auth/securid.c
index 134e688d988426394967776a82e824f8929daa6f..e80c682b574abe02e483d36f5a63127e2d7c4f4b 100644 (file)
--- a/auth/securid.c
+++ b/auth/securid.c
@@ -54,7 +54,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 union config_record configure;

diff --git a/auth/securid5.c b/auth/securid5.c
index 5a2f40ea56303ce70425755ba8b73b33206a5dfd..3e30748808f148cd7c39987a63b1e6bd4c503510 100644 (file)
--- a/auth/securid5.c
+++ b/auth/securid5.c
@@ -56,7 +56,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/auth/sia.c b/auth/sia.c
index 356bcb7fcac86d7a93832963e59ace6c95eabe17..21e7adfd89e7eb30393cd460017be1d32cb43ee8 100644 (file)
--- a/auth/sia.c
+++ b/auth/sia.c
@@ -50,7 +50,7 @@
 #include "sudo_auth.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 static int sudo_collect        __P((int, int, uchar_t *, int, prompt_t *));

diff --git a/auth/sudo_auth.c b/auth/sudo_auth.c
index f9173cc3fda95610b7065889db674a6e8c213d25..d51072a61c5133fd6a94526ef4630f9ee07f8994 100644 (file)
--- a/auth/sudo_auth.c
+++ b/auth/sudo_auth.c
@@ -53,7 +53,7 @@
 #include "insults.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 sudo_auth auth_switch[] = {

diff --git a/check.c b/check.c
index 81f754bb011e0c244a930becb5d8c52222786480..46d0428ab8bb8f82f1459130ce1eed4e67b3cdd1 100644 (file)
--- a/check.c
+++ b/check.c
@@ -55,7 +55,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /* Status codes for timestamp_status() */

diff --git a/closefrom.c b/closefrom.c
index 70336acd4183ea9dd237bc5d921a2e55af2040d8..32a065381ec270db4488baa1c0c5ea06ecc19669 100644 (file)
--- a/closefrom.c
+++ b/closefrom.c
@@ -48,7 +48,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/compat.h b/compat.h
index c4eaeee0593e156365315d3b569478e97b0f2504..0d1b1e0686b2d2503f407e775c78b1bebafe6c22 100644 (file)
--- a/compat.h
+++ b/compat.h
@@ -38,7 +38,12 @@
 
 /* Define away __attribute__ for non-gcc or old gcc */
 #if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 5
-#define __attribute__(x)
+# define __attribute__(x)
+#endif
+
+/* For silencing gcc warnings about rcsids */
+#ifndef __unused
+# define __unused      __attribute__((__unused__))
 #endif
 
 /*

diff --git a/defaults.c b/defaults.c
index 1b50c52fb3fae36ffde7458590ee385b3b67486d..30e0eb78d3d1ae67f06310f3a5d253d63b23708d 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -49,7 +49,7 @@
 #include <gram.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/env.c b/env.c
index 40286b918a09a84997bdcddea5093d3a6c8caace..98bd3d34a40f067166baf0ddb44b8484f7a4ef6a 100644 (file)
--- a/env.c
+++ b/env.c
@@ -47,7 +47,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/error.c b/error.c
index e25fecc52c5142cc7fa7ab0af8b7ab50a5a42cf2..3893e7c8bd9f83f1de724b4c25ce404840785918 100644 (file)
--- a/error.c
+++ b/error.c
@@ -24,7 +24,7 @@
 #include "error.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 static void _warning   __P((int, const char *, va_list));

diff --git a/fileops.c b/fileops.c
index 7f7bc2d49a71823fa2810673c54e52364aa9b830..8a1c12fcd18716d8e3bd20ba7fdbdedb042d6aa9 100644 (file)
--- a/fileops.c
+++ b/fileops.c
@@ -38,7 +38,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/find_path.c b/find_path.c
index 7ec916dd51631e75e5689709c61c4635c1c704fe..e6a6f502f7382353e4a9a8741d7a404b70c9aadd 100644 (file)
--- a/find_path.c
+++ b/find_path.c
@@ -46,7 +46,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/fnmatch.c b/fnmatch.c
index cbf4fd25b307b9787a134ed04f63b7539c085c74..3c2e02d7fbf3ef2d4c700251bac3291753bf6e51 100644 (file)
--- a/fnmatch.c
+++ b/fnmatch.c
@@ -30,10 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.6 1998/03/19 00:29:59 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 /*
  * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
  * Compares a filename or pathname to a pattern.
@@ -61,6 +57,10 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.6 1998/03/19 00:29:59 millert Exp
 #define        RANGE_NOMATCH   0
 #define        RANGE_ERROR     (-1)
 
+#if defined(LIBC_SCCS) && !defined(lint)
+__unused static const char rcsid[] = "$OpenBSD: fnmatch.c,v 1.6 1998/03/19 00:29:59 millert Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 static int rangematch __P((const char *, char, int, char **));
 
 int

diff --git a/getcwd.c b/getcwd.c
index da3c2c0235ef240ba65ca55011e0e74d3c84b8c3..a32bc47b51e273def4358c4cabca32fb1ec8bd83 100644 (file)
--- a/getcwd.c
+++ b/getcwd.c
@@ -79,7 +79,7 @@
            (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 char *

diff --git a/getprogname.c b/getprogname.c
index eff79fdcc2574e71603ef9a5a8f47d8899f75951..1cebf84e1d51609d9205ef3223c84fe35c1fe477 100644 (file)
--- a/getprogname.c
+++ b/getprogname.c
@@ -22,9 +22,10 @@
 #include <string.h>
 
 #include <config.h>
+#include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 const char *

diff --git a/getspwuid.c b/getspwuid.c
index 8002e7bdc7db5e0bfde470ae0f08e98e2e8ac464..afc3e311f2d55ea0e7b9ba2ddf455c43c79f22c3 100644 (file)
--- a/getspwuid.c
+++ b/getspwuid.c
@@ -71,7 +71,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/gettime.c b/gettime.c
index 3ec982f194f32cc81d9bd0ff441fac80a1ab3eed..798ce3f1dd099a8fcd34f5e7a438f38d167a3d58 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -25,7 +25,7 @@
 #include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/goodpath.c b/goodpath.c
index af8c55479843adaaab60dec1f1a94242cffc0c5f..2ee81abc9b32c0f34e7c0caaaaa6fa9071f448dc 100644 (file)
--- a/goodpath.c
+++ b/goodpath.c
@@ -40,7 +40,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/gram.c b/gram.c
index 94bd7b7059b765b170f180fceb2784ef7d3a92fa..3788ec8831c3c952899feeeb4f48aa32f5463980 100644 (file)
--- a/gram.c
+++ b/gram.c
@@ -70,7 +70,7 @@ static char yyrcsid[]
 #include "parse.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/gram.y b/gram.y
index 3ce6a48e5392175c5218c2bb3149e42a59c17f8e..a12ee03c316f45e4affb4e47951d372c036a608b 100644 (file)
--- a/gram.y
+++ b/gram.y
@@ -52,7 +52,7 @@
 #include "parse.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/interfaces.c b/interfaces.c
index d009eef3f94375014bdabbd22211470bb6142c0d..4905a7b6f3eb136058006154add8786e45df2d5e 100644 (file)
--- a/interfaces.c
+++ b/interfaces.c
@@ -83,7 +83,7 @@ struct rtentry;
 #include "interfaces.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 

diff --git a/ldap.c b/ldap.c
index bee2562919b6d988dfd09ec69b954de33cb051a6..7ab86a31b42a1b6b2809eb5524d00ec90f6cb139 100644 (file)
--- a/ldap.c
+++ b/ldap.c
@@ -57,7 +57,7 @@
 #include "parse.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /* LDAP code below */

diff --git a/logging.c b/logging.c
index c2db37045b6f96387e06c4e8897579b08c1630b0..694ab6f69bd9143835ee9a57d93620ed044c3465 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -56,7 +56,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 static void do_syslog          __P((int, char *));

diff --git a/match.c b/match.c
index 80860a0cad31dcd923a286acf33672f0c5dc7773..d5db94b9f27790784ee04dd0868b28bf751d0204 100644 (file)
--- a/match.c
+++ b/match.c
@@ -89,7 +89,7 @@
 #endif /* HAVE_EXTENDED_GLOB */
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/mon_systrace.c b/mon_systrace.c
index ddb45b2c00656856c43781778236e5c86fb7afe3..e8abb3b64e931ea35e1a48931dc0138abfa9a0b0 100644 (file)
--- a/mon_systrace.c
+++ b/mon_systrace.c
@@ -45,7 +45,7 @@
 #include "mon_systrace.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/parse.c b/parse.c
index 9a70cd6f267c2c67b1271393d40603856e143aeb..99840ba84ed62c4b86cbeae9de6e2922648aa755 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -48,7 +48,7 @@
 #include <gram.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/pwutil.c b/pwutil.c
index ed99595257d77e1cb03a9f0040d5c87f2c99fea5..01e72ef70dc7fdb7e760527856526e5e71663256 100644 (file)
--- a/pwutil.c
+++ b/pwutil.c
@@ -52,7 +52,7 @@
 #include "redblack.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 #ifdef MYPW

diff --git a/set_perms.c b/set_perms.c
index c01c854e627dd9c57645b461a51e855755741739..d2c32b34592eabc363bbe784051d740805a111ca 100644 (file)
--- a/set_perms.c
+++ b/set_perms.c
@@ -52,7 +52,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 #ifdef __TANDEM

diff --git a/sigaction.c b/sigaction.c
index 3eb710cf89ba12e230e03ce01f7af8368fd915e0..478f621a9fb7c06e89a4a8a58b2a45a69c38a432 100644 (file)
--- a/sigaction.c
+++ b/sigaction.c
@@ -24,7 +24,7 @@
 #include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 int

diff --git a/snprintf.c b/snprintf.c
index 1735d2996b6206816943e104b53c7117e5108c37..85812d4b5db97bc7fe56312d7bb693ee276923aa 100644 (file)
--- a/snprintf.c
+++ b/snprintf.c
@@ -76,7 +76,7 @@
 #include "compat.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 static int xxxprintf    __P((char **, size_t, int, const char *, va_list));

diff --git a/strcasecmp.c b/strcasecmp.c
index a8bb8d8cac59fac54aa4ec897493d7ef1893f56f..785b785333914cddd99ee5d9f3deaab9d21f2f34 100644 (file)
--- a/strcasecmp.c
+++ b/strcasecmp.c
@@ -14,11 +14,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <config.h>
 #include <sys/types.h>
+#include <config.h>
+#include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/strerror.c b/strerror.c
index 6dc08f9c5938782863eb4b890e6da396983cabb3..1500ceb31b7fd2acc5ded94453c94cbb5bb740c6 100644 (file)
--- a/strerror.c
+++ b/strerror.c
@@ -22,9 +22,10 @@
 #include <errno.h>
 
 #include <config.h>
+#include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/strlcat.c b/strlcat.c
index 2127b38338e86891727eb4b86f9d44d9c133c2c2..535d87b60f695ad9000d4ff7443dcebfee328165 100644 (file)
--- a/strlcat.c
+++ b/strlcat.c
@@ -20,9 +20,10 @@
 #include <string.h>
 
 #include <config.h>
+#include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 

diff --git a/strlcpy.c b/strlcpy.c
index 06a87c20743a4b236701fecd1f193a743137fc2b..127a81672f3bfd501d6f5be7d9cb351427048546 100644 (file)
--- a/strlcpy.c
+++ b/strlcpy.c
@@ -19,9 +19,10 @@
 #include <sys/types.h>
 
 #include <config.h>
+#include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/sudo.c b/sudo.c
index 6a930a2ed8c94733184be147126d017a39204c24..67dcb53a04e65ecfa0b702d5c82d15c43e9ba217 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -90,7 +90,7 @@
 #include "version.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/sudo_edit.c b/sudo_edit.c
index d96233650566e81a6399b7f6aa20def04ffc0bd3..8f6bd1cbe862d3354bd549007a051d3c2edc904b 100644 (file)
--- a/sudo_edit.c
+++ b/sudo_edit.c
@@ -53,7 +53,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 extern sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp, saved_sa_chld;

diff --git a/sudo_noexec.c b/sudo_noexec.c
index 129ea3a77e1f077ae4f84e1dcb0288787ab105bb..024565e9d1ab4814d27b7207337b25f8aaf4ec18 100644 (file)
--- a/sudo_noexec.c
+++ b/sudo_noexec.c
@@ -14,12 +14,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <config.h>
-
 #include <errno.h>
 
+#include <config.h>
+#include <compat.h>
+
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*

diff --git a/testsudoers.c b/testsudoers.c
index d51d592ddebd81e97ff38e88ea10a4d418edc172..bc6ed103d75500e71a53067d47e0ec9a0ac4677a 100644 (file)
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -70,7 +70,7 @@
 #endif /* HAVE_FNMATCH */
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 

diff --git a/tgetpass.c b/tgetpass.c
index 44a2f31a1fc6ec3aa37855426311209d6ff342ff..edcf7b86484621822c8b139e25f796b38dae33b3 100644 (file)
--- a/tgetpass.c
+++ b/tgetpass.c
@@ -70,7 +70,7 @@
 #include "sudo.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 #ifndef TCSASOFT

diff --git a/toke.c b/toke.c
index caa2b656f963deb7b6cb0a4f839cf05ac0e3fe6f..ccc5aea30d907ff1a0efa1ae0d64fc145788026b 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -1040,7 +1040,7 @@ char *yytext;
 #include <gram.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 extern YYSTYPE yylval;

diff --git a/toke.l b/toke.l
index effa40e00218edf151d4dd7ee366aa12e170ba86..5055f9eeb19c12241dc91ba0658785c268011625 100644 (file)
--- a/toke.l
+++ b/toke.l
@@ -54,7 +54,7 @@
 #include <gram.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 extern YYSTYPE yylval;

diff --git a/utimes.c b/utimes.c
index c0016456e6eb52a89ba44799e99c6c0d6c8f432e..969346567bc5291588110ef6306d2c2ecb4ce3c5 100644 (file)
--- a/utimes.c
+++ b/utimes.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <config.h>
+#include <compat.h>
 
 #ifdef HAVE_UTIME_H
 # include <utime.h>
@@ -30,7 +31,7 @@
 #endif
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 #ifndef HAVE_UTIMES

diff --git a/visudo.c b/visudo.c
index c7fab021296fdb5f54033ec085d9661a5196c25f..21bc7cc8d7605a28bc2b9c23c3a9a1d2dcca717b 100644 (file)
--- a/visudo.c
+++ b/visudo.c
@@ -83,7 +83,7 @@
 #include "version.h"
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 struct sudoersfile {

diff --git a/zero_bytes.c b/zero_bytes.c
index 0937ad38208cb0d551768cd092b01a98fd951e40..1e190f7bdd394d2b950dd3483a389479c8e31a41 100644 (file)
--- a/zero_bytes.c
+++ b/zero_bytes.c
@@ -17,9 +17,10 @@
 #include <sys/types.h>
 
 #include <config.h>
+#include <compat.h>
 
 #ifndef lint
-static const char rcsid[] = "$Sudo$";
+__unused static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
 /*