From 19105c8312c841631a5eff3408f8a43f4958e9ba Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 3 May 2003 18:41:59 +0000 Subject: Use __FBSDID() to quiet GCC 3.3 warnings. --- sbin/fsck_ffs/dir.c | 13 +++++++------ sbin/fsck_ffs/ea.c | 6 ++---- sbin/fsck_ffs/fsutil.c | 8 ++++---- sbin/fsck_ffs/inode.c | 8 ++++---- sbin/fsck_ffs/main.c | 5 ++--- sbin/fsck_ffs/pass1.c | 8 ++++---- sbin/fsck_ffs/pass1b.c | 8 ++++---- sbin/fsck_ffs/pass2.c | 1 - sbin/fsck_ffs/pass3.c | 8 ++++---- sbin/fsck_ffs/pass4.c | 8 ++++---- sbin/fsck_ffs/pass5.c | 1 - sbin/fsck_ffs/setup.c | 8 ++++---- sbin/fsck_ffs/utilities.c | 8 ++++---- 13 files changed, 43 insertions(+), 47 deletions(-) (limited to 'sbin/fsck_ffs') diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 4b0d3bf..47e2bb4 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include #include @@ -211,9 +211,10 @@ dpok: static int dircheck(struct inodesc *idesc, struct direct *dp) { - int size; + size_t size; char *cp; - u_char namlen, type; + u_char type; + u_int namlen; int spaceleft; spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ); diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index d78f11e..2cdf71e 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -33,10 +33,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index c684b94..3985088 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index d05e330..b7152be 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 0e45917..2aab1fc 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1986, 1993\n\ @@ -38,11 +39,9 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95"; -#endif #endif /* not lint */ - +#endif #include __FBSDID("$FreeBSD$"); diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 5a18abd..272b5f1 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index b30a2b1..d302952 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass1b.c 8.4 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index 388dc8e..470f986 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -36,7 +36,6 @@ static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95"; #endif /* not lint */ #endif - #include __FBSDID("$FreeBSD$"); diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index f9bbfa7..0ae3267 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass3.c 8.2 (Berkeley) 4/27/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c index da29804..847dd97 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/pass4.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)pass4.c 8.4 (Berkeley) 4/28/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index de0bd75..6dbde11 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -36,7 +36,6 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95"; #endif /* not lint */ #endif - #include __FBSDID("$FreeBSD$"); diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 6cbdf26..5fa884f 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index 7210837..441fd93 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #include #include -- cgit v1.1