more -Wall

diff --git a/check.c b/check.c
index 2cdf672814f07e8a5af03fbb39291d6b0734048b..883b4daef4d2dcff95120a2d1a08bc8fcc226749 100644 (file)
--- a/check.c
+++ b/check.c
@@ -35,10 +35,6 @@
  *  Jeff Nieusma  Thu Mar 21 22:39:07 MST 1991
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -97,6 +93,9 @@ static const char rcsid[] = "$Id$";
 #include "insults.h"
 #include "version.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 /*
  * Prototypes for local functions

diff --git a/check_sia.c b/check_sia.c
index 1bf69dc9f2e31ff435355cee4799b3546495b939..67ff6ab72d06127435df085d2bad037dce852ecf 100644 (file)
--- a/check_sia.c
+++ b/check_sia.c
@@ -25,10 +25,6 @@
  *  Spider Boardman Sep 26, 1998
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #ifdef HAVE_SIA
@@ -54,6 +50,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Prototypes for local functions
  */

diff --git a/find_path.c b/find_path.c
index 85cf8c898563ce7ef7d4ef64d4463e86b69f5bb9..d9c9d3f3d7a8473a9d488eb46797f6bc917674b5 100644 (file)
--- a/find_path.c
+++ b/find_path.c
@@ -28,10 +28,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Mar 25 21:50:36 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -72,7 +68,6 @@ extern char *strdup   __P((const char *));
 #endif /* HAVE_STRDUP */
 #endif /* !STDC_HEADERS */
 
-
 #ifndef _S_IFMT
 #define _S_IFMT                S_IFMT
 #endif /* _S_IFMT */
@@ -80,6 +75,9 @@ extern char *strdup   __P((const char *));
 #define _S_IFLNK       S_IFLNK
 #endif /* _S_IFLNK */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 /*******************************************************************
  *

diff --git a/getcwd.c b/getcwd.c
index 2a3e9e9832989df17ca6096146c55f24b6e613cd..503925f043ddc3cd73944a4b97636b667ef7b2a5 100644 (file)
--- a/getcwd.c
+++ b/getcwd.c
@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: getcwd.c,v 1.5 1998/08/14 21:39:26 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "config.h"
 
 #include <sys/param.h>
@@ -80,6 +76,10 @@ static const char rcsid[] = "$OpenBSD: getcwd.c,v 1.5 1998/08/14 21:39:26 deraad
        (dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
            (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char rcsid[] = "$OpenBSD: getcwd.c,v 1.5 1998/08/14 21:39:26 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 char *
 getcwd(pt, size)
        char *pt;

diff --git a/getspwuid.c b/getspwuid.c
index 20123b5aeb1e9425b0d2030bc7a31c5b8728c9f6..29fdb09f0510a4f40bddf732a97380d96441a894 100644 (file)
--- a/getspwuid.c
+++ b/getspwuid.c
@@ -27,10 +27,6 @@
  *  Todd C. Miller  Mon Nov 20 13:53:06 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -73,6 +69,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 #ifndef STDC_HEADERS
 #ifndef __GNUC__                /* gcc has its own malloc */
 extern char *malloc     __P((size_t));

diff --git a/goodpath.c b/goodpath.c
index 510269ca681cfa8eddc0a3886a52419d15844419..aed31cc3934fc0e5fd47a385bc679549bed2ef88 100644 (file)
--- a/goodpath.c
+++ b/goodpath.c
@@ -28,10 +28,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Mar 25 21:58:17 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -56,6 +52,9 @@ static const char rcsid[] = "$Id$";
 extern int stat                __P((const char *, struct stat *));
 #endif /* !STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 /******************************************************************
  *

diff --git a/interfaces.c b/interfaces.c
index 8d0e0b0b8a70b297da37bd329480324e076c05c0..48b50c3cd1eef6905f9b3f9da771925ee2c7a71c 100644 (file)
--- a/interfaces.c
+++ b/interfaces.c
@@ -26,10 +26,6 @@
  *  Todd C. Miller  Mon May  1 20:48:43 MDT 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -53,11 +49,7 @@ static const char rcsid[] = "$Id$";
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#else
 #include <sys/ioctl.h>
-#endif /* HAVE_SYS_SOCKIO_H */
 #ifdef _ISC
 #include <sys/stream.h>
 #include <sys/sioctl.h>
@@ -83,6 +75,10 @@ extern char *malloc  __P((size_t));
 extern char *realloc   __P((VOID *, size_t));
 #endif /* !STDC_HEADERS && !__GNUC__ */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */

diff --git a/logging.c b/logging.c
index 0b3d8766571a01a8513567702daa59c2c9f6ad03..692a9136f9f087966f76f7f7372966a0bcfb341b 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -36,10 +36,6 @@
  *  Jeff Nieusma   Thu Mar 21 23:39:04 MST 1991
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -70,6 +66,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Prototypes for local functions
  */

diff --git a/lsearch.c b/lsearch.c
index 3e07ff3f7a8bce5bd2c3c59f41633003f01f046d..7de302ba2ac015c4b98e765c7edac2735b97e8ee 100644 (file)
--- a/lsearch.c
+++ b/lsearch.c
@@ -34,13 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lsearch.c  8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -52,6 +45,12 @@ static const char rcsid[] = "$Id$";
 #include "compat.h"
 #include "emul/search.h"
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char sccsid[] = "@(#)lsearch.c    8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 typedef int (*cmp_fn_t) __P((const VOID *, const VOID *));
 static VOID *linear_base __P((const VOID *, const VOID *, size_t *, size_t,

diff --git a/parse.c b/parse.c
index 52893cdcbbaaedd942b2e16c509853438646cf4f..876190713343aa8d214b01164d242ba7a38e95e1 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -24,10 +24,6 @@
  * Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -84,6 +80,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */

diff --git a/parse.lex b/parse.lex
index d8e205de5166f9fc3c31566eb59ef5168b4f4ad4..3011d5b7dcd3401b055d67b60430e4b3953014ae 100644 (file)
--- a/parse.lex
+++ b/parse.lex
@@ -25,10 +25,6 @@
  * Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #ifdef STDC_HEADERS
@@ -50,6 +46,10 @@ static const char rcsid[] = "$Id$";
 #include "sudo.h"
 #include "sudo.tab.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 #undef yywrap          /* guard against a yywrap macro */
 
 extern YYSTYPE yylval;

diff --git a/parse.yacc b/parse.yacc
index 089152ab05926901232fa606ca30d02f6215a8ae..4d11f6dc1e105845827ff8f5e3ef42656be6823e 100644 (file)
--- a/parse.yacc
+++ b/parse.yacc
@@ -26,10 +26,6 @@
  * Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -65,6 +61,10 @@ static const char rcsid[] = "$Id$";
 #define strcasecmp(a,b)                strcmp(a,b)
 #endif /* !HAVE_STRCASECMP */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */

diff --git a/putenv.c b/putenv.c
index 1c791d7255b1b30e5129eb5e2a11e7d558f784eb..765f98411721eb5980d538922b82a5859d3445f7 100644 (file)
--- a/putenv.c
+++ b/putenv.c
@@ -24,10 +24,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sun Aug  7 20:30:17 MDT 1994
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -50,6 +46,10 @@ static const char rcsid[] = "$Id$";
 extern char *malloc    __P((size_t));
 #endif /* !STDC_HEADERS && !gcc */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *

diff --git a/secureware.c b/secureware.c
index bafce86cc9c7949bb2de4adb451206c5f8066b2e..7d80d035cc0983eeb7844e335a924c56564c7bab 100644 (file)
--- a/secureware.c
+++ b/secureware.c
@@ -24,10 +24,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Oct 17 14:42:44 MDT 1998
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #ifdef HAVE_GETPRPWNAM
@@ -58,6 +54,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /********************************************************************
  *

diff --git a/strdup.c b/strdup.c
index c4d00af9e3e1a81ed2e8acd38aa1b130a6df3644..2d983506648ccb44af782f4d08a678f2b8b425db 100644 (file)
--- a/strdup.c
+++ b/strdup.c
@@ -32,10 +32,6 @@
  *  Jeff Nieusma  Thu Mar 21 23:11:23 MST 1991
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -61,6 +57,10 @@ extern char *malloc  __P((size_t));
 extern char *strcpy    __P((char *, const char *));
 #endif /* !STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *

diff --git a/sudo.c b/sudo.c
index c99018fc22820885054d2cbcea46c3d0233825f3..3d78c0e0e865f0434d0d8ef1c724b814931828a2 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -50,10 +50,6 @@
  *             Todd Miller  <Todd.Miller@courtesan.com>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #define MAIN
 
 #include "config.h"
@@ -99,6 +95,10 @@ extern char *strdup  __P((const char *));
 extern char *getenv    __P((char *));
 #endif /* STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /*
  * Local type declarations

diff --git a/sudo_setenv.c b/sudo_setenv.c
index 54f1bbdf546a637f60406e8ac6f2f0496c568392..97a9bd5462e74ee28b756315728be427fd4e1e2b 100644 (file)
--- a/sudo_setenv.c
+++ b/sudo_setenv.c
@@ -25,10 +25,6 @@
  *  Todd C. Miller (millert@colorado.edu) Fri Jun  3 18:32:19 MDT 1994
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -56,6 +52,10 @@ extern int setenv    __P((char *, char *, int));
 #endif /* HAVE_SETENV */
 #endif /* !STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /**********************************************************************
  *

diff --git a/testsudoers.c b/testsudoers.c
index a70b495959fc903efe22beb18a2831037ddf36f8..01a14202b4bc48542d732dc8a29272c6586fedee 100644 (file)
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -24,10 +24,6 @@
  *  Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -68,6 +64,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */

diff --git a/tgetpass.c b/tgetpass.c
index 8a71f59f59901a9dff246c06d09a5d571d6ce65b..11bca9deeca3d0d70cfe59e70be8f52c223427bc 100644 (file)
--- a/tgetpass.c
+++ b/tgetpass.c
@@ -26,10 +26,6 @@
  *  Todd C. Miller  Sun Jun  5 17:22:31 MDT 1994
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -85,6 +81,10 @@ static const char rcsid[] = "$Id$";
 #define TCSASOFT       0
 #endif /* TCSASOFT */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *

diff --git a/utime.c b/utime.c
index e87f4d1c6e17f3db7b32866e80b47ef3697b3694..9ce675869965d61d5a6330f32c5a173885ab479e 100644 (file)
--- a/utime.c
+++ b/utime.c
@@ -26,10 +26,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Jun 17 16:42:41 MDT 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -43,6 +39,10 @@ static const char rcsid[] = "$Id$";
 #include "compat.h"
 #include "emul/utime.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *

diff --git a/visudo.c b/visudo.c
index 2d3f966fc8b9e0c281c6984d959f08357f7d0974..8e67bf5a782e28ae8cadf3086b29a9d504462a1f 100644 (file)
--- a/visudo.c
+++ b/visudo.c
@@ -25,10 +25,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Mar 25 21:50:36 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -73,6 +69,10 @@ extern int stat              __P((const char *, struct stat *));
 #define SA_RESETHAND    0
 #endif /* POSIX_SIGNALS && !SA_RESETHAND */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Function prototypes
  */