From owner-freebsd-bugs@FreeBSD.ORG Tue Sep 9 12:30:21 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0951916A4BF for ; Tue, 9 Sep 2003 12:30:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6B5A43FEA for ; Tue, 9 Sep 2003 12:30:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h89JUGUp082200 for ; Tue, 9 Sep 2003 12:30:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h89JUGIS082199; Tue, 9 Sep 2003 12:30:16 -0700 (PDT) Resent-Date: Tue, 9 Sep 2003 12:30:16 -0700 (PDT) Resent-Message-Id: <200309091930.h89JUGIS082199@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Stefan Farfeleder Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 650C116A4BF for ; Tue, 9 Sep 2003 12:23:15 -0700 (PDT) Received: from fafoe.narf.at (chello212186121237.14.vie.surfer.at [212.186.121.237]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D38943FF3 for ; Tue, 9 Sep 2003 12:23:12 -0700 (PDT) (envelope-from stefan@fafoe.dyndns.org) Received: from frog.fafoe.narf.at (frog.fafoe.narf.at [192.168.2.101]) by fafoe.narf.at (Postfix) with ESMTP id 0883B40B6; Tue, 9 Sep 2003 21:22:59 +0200 (CEST) Received: by frog.fafoe.narf.at (Postfix, from userid 1001) id 747E9406; Tue, 9 Sep 2003 21:22:56 +0200 (CEST) Message-Id: <20030909192256.747E9406@frog.fafoe.narf.at> Date: Tue, 9 Sep 2003 21:22:56 +0200 (CEST) From: Stefan Farfeleder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: stefan@fafoe.narf.at Subject: bin/56649: [patch] More spurious semicolon removal X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Stefan Farfeleder List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2003 19:30:21 -0000 >Number: 56649 >Category: bin >Synopsis: [patch] More spurious semicolon removal >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Sep 09 12:30:16 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Stefan Farfeleder >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD frog.fafoe.narf.at 5.1-CURRENT FreeBSD 5.1-CURRENT #7: Sun Sep 7 18:53:15 CEST 2003 freebsd@frog.fafoe.narf.at:/freebsd/frog/obj/freebsd/frog/src/sys/FROG i386 >Description: As explained in bin/56492, spurious semicolons outside function bodies are errors. The one in gstat.c is actually allowed in C99 but it seems silly to lose backwards compatibility to C89 due to a semicolon. The macros ic, vc and DECL already have semicolons after their invocations, removing the one in the macro definition is shorter. >How-To-Repeat: >Fix: --- semicolon.diff begins here --- Index: src/usr.bin/finger/net.c =================================================================== RCS file: /usr/home/ncvs/src/usr.bin/finger/net.c,v retrieving revision 1.22 diff -u -r1.22 net.c --- src/usr.bin/finger/net.c 2 Dec 2002 20:38:12 -0000 1.22 +++ src/usr.bin/finger/net.c 5 Sep 2003 15:12:06 -0000 @@ -58,7 +58,7 @@ #include #include "finger.h" -static void cleanup(int sig);; +static void cleanup(int sig); static int do_protocol(const char *name, const struct addrinfo *ai); static void trying(const struct addrinfo *ai); Index: src/usr.sbin/gstat/gstat.c =================================================================== RCS file: /usr/home/ncvs/src/usr.sbin/gstat/gstat.c,v retrieving revision 1.5 diff -u -r1.5 gstat.c --- src/usr.sbin/gstat/gstat.c 22 Mar 2003 09:47:02 -0000 1.5 +++ src/usr.sbin/gstat/gstat.c 5 Sep 2003 17:30:53 -0000 @@ -62,7 +62,7 @@ struct timespec tp, tq; struct gmesh gmp; struct gprovider *pp; - struct gconsumer *cp;; + struct gconsumer *cp; struct gident *gid; short cf, cb; char *p; Index: src/usr.sbin/keyserv/keyserv.h =================================================================== RCS file: /usr/home/ncvs/src/usr.sbin/keyserv/keyserv.h,v retrieving revision 1.2 diff -u -r1.2 keyserv.h --- src/usr.sbin/keyserv/keyserv.h 22 Mar 2001 04:31:30 -0000 1.2 +++ src/usr.sbin/keyserv/keyserv.h 5 Sep 2003 20:13:06 -0000 @@ -3,7 +3,7 @@ */ extern void setmodulus __P((char *modx)); -extern keystatus pk_setkey __P(( uid_t, keybuf ));; +extern keystatus pk_setkey __P(( uid_t, keybuf )); extern keystatus pk_encrypt __P(( uid_t, char *, netobj *, des_block * )); extern keystatus pk_decrypt __P(( uid_t, char *, netobj *, des_block * )); extern keystatus pk_netput __P(( uid_t, key_netstarg * )); Index: src/usr.sbin/mrouted/cfparse.y =================================================================== RCS file: /usr/home/ncvs/src/usr.sbin/mrouted/cfparse.y,v retrieving revision 1.12 diff -u -r1.12 cfparse.y --- src/usr.sbin/mrouted/cfparse.y 5 Jul 2001 09:28:13 -0000 1.12 +++ src/usr.sbin/mrouted/cfparse.y 9 Sep 2003 16:13:12 -0000 @@ -20,7 +20,7 @@ * Local function declarations */ static void fatal __P((char *fmt, ...)) __printflike(1, 2); -static void warn __P((char *fmt, ...)) __printflike(1, 2);; +static void warn __P((char *fmt, ...)) __printflike(1, 2); static void yyerror __P((char *s)); static char * next_word __P((void)); static int yylex __P((void)); Index: src/usr.sbin/rpc.lockd/lockd_lock.c =================================================================== RCS file: /usr/home/ncvs/src/usr.sbin/rpc.lockd/lockd_lock.c,v retrieving revision 1.11 diff -u -r1.11 lockd_lock.c --- src/usr.sbin/rpc.lockd/lockd_lock.c 14 May 2003 21:16:33 -0000 1.11 +++ src/usr.sbin/rpc.lockd/lockd_lock.c 5 Sep 2003 19:29:42 -0000 @@ -172,7 +172,7 @@ const u_int64_t offset, const u_int64_t len, const char *caller_name, const int state, const int status, const int flags, const int blocking); int regions_overlap(const u_int64_t start1, const u_int64_t len1, - const u_int64_t start2, const u_int64_t len2);; + const u_int64_t start2, const u_int64_t len2); enum split_status region_compare(const u_int64_t starte, const u_int64_t lene, const u_int64_t startu, const u_int64_t lenu, u_int64_t *start1, u_int64_t *len1, u_int64_t *start2, u_int64_t *len2); Index: src/lib/libdisk/disk.c =================================================================== RCS file: /usr/home/ncvs/src/lib/libdisk/disk.c,v retrieving revision 1.118 diff -u -r1.118 disk.c --- src/lib/libdisk/disk.c 28 Aug 2003 17:39:09 -0000 1.118 +++ src/lib/libdisk/disk.c 9 Sep 2003 13:22:08 -0000 @@ -79,7 +79,7 @@ case efi: return ("efi"); default: return ("??"); } -}; +} static chunk_e uuid_type(uuid_t *uuid) Index: src/sbin/ipfw/ipfw2.c =================================================================== RCS file: /usr/home/ncvs/src/sbin/ipfw/ipfw2.c,v retrieving revision 1.39 diff -u -r1.39 ipfw2.c --- src/sbin/ipfw/ipfw2.c 2 Sep 2003 10:36:40 -0000 1.39 +++ src/sbin/ipfw/ipfw2.c 8 Sep 2003 14:40:34 -0000 @@ -357,7 +357,7 @@ bcopy (pll, &ret, sizeof(ret)); return ret; -}; +} /* * conditionally runs the command. @@ -399,7 +399,7 @@ if (strlen(pt->s) == i && !bcmp(string, pt->s, i)) return pt->x; return -1; -}; +} /** * match_value takes a table and a value, returns the string associated Index: src/usr.sbin/boot0cfg/boot0cfg.c =================================================================== RCS file: /usr/home/ncvs/src/usr.sbin/boot0cfg/boot0cfg.c,v retrieving revision 1.15 diff -u -r1.15 boot0cfg.c --- src/usr.sbin/boot0cfg/boot0cfg.c 3 May 2003 21:06:35 -0000 1.15 +++ src/usr.sbin/boot0cfg/boot0cfg.c 5 Sep 2003 20:12:32 -0000 @@ -367,7 +367,7 @@ if (memcmp(bs + ident[i].off, ident[i].key, ident[i].len)) return 0; return 1; -}; +} /* * Adjust "and" and "or" masks for a -o option argument. Index: src/lib/msun/bsdsrc/mathimpl.h =================================================================== RCS file: /usr/home/ncvs/src/lib/msun/bsdsrc/mathimpl.h,v retrieving revision 1.3 diff -u -r1.3 mathimpl.h --- src/lib/msun/bsdsrc/mathimpl.h 28 May 2002 17:03:12 -0000 1.3 +++ src/lib/msun/bsdsrc/mathimpl.h 7 Sep 2003 21:38:01 -0000 @@ -70,13 +70,13 @@ # define vc(name, value, x1,x2,x3,x4, bexp, xval) \ const static long cat3(name,,x)[] = {cat3t(0x,x1,x2), cat3t(0x,x3,x4)}; -# define ic(name, value, bexp, xval) ; +# define ic(name, value, bexp, xval) #else /* vax or tahoe */ /* Hooray, we have an IEEE machine */ # undef vccast -# define vc(name, value, x1,x2,x3,x4, bexp, xval) ; +# define vc(name, value, x1,x2,x3,x4, bexp, xval) # define ic(name, value, bexp, xval) \ const static double name = value; Index: src/usr.sbin/pccard/pccardc/pccardc.c =================================================================== RCS file: /usr/home/ncvs/src/usr.sbin/pccard/pccardc/pccardc.c,v retrieving revision 1.12 diff -u -r1.12 pccardc.c --- src/usr.sbin/pccard/pccardc/pccardc.c 9 Jun 2003 06:16:00 -0000 1.12 +++ src/usr.sbin/pccard/pccardc/pccardc.c 5 Sep 2003 20:10:55 -0000 @@ -36,7 +36,7 @@ typedef int (*main_t)(int, char **); -#define DECL(foo) int foo(int, char**); +#define DECL(foo) int foo(int, char**) DECL(beep_main); DECL(dumpcis_main); DECL(dumpcisfile_main); --- semicolon.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: