Remove some unneeded semicolons across the tree.

diff --git a/sys/bus/firewire/firewire.c b/sys/bus/firewire/firewire.c
index 2b60c9d..2dee46f 100644 (file)
--- a/sys/bus/firewire/firewire.c
+++ b/sys/bus/firewire/firewire.c
@@ -1561,7 +1561,7 @@ fw_bus_explore_callback(struct fw_xfer *xfer)
                while(((fc->ongoaddr - offset)/4 > chdr->crc_len)){
                        if(csrd == NULL){
                                goto nextnode;
-                       };
+                       }
                        fc->ongoaddr = csrd->ongoaddr + 4;
                        SLIST_REMOVE_HEAD(&fc->ongocsr, link);
                        SLIST_INSERT_HEAD(&fc->csrfree, csrd, link);

diff --git a/sys/bus/iicbus/pcf/pcf.c b/sys/bus/iicbus/pcf/pcf.c
index 03f8b70..5166133 100644 (file)
--- a/sys/bus/iicbus/pcf/pcf.c
+++ b/sys/bus/iicbus/pcf/pcf.c
@@ -627,7 +627,7 @@ pcf_read(device_t pcfdev, char *buf, int len, int *read, int last,
 
                len --;
                bytes ++;
-       };
+       }
 
 error:
        *read = bytes;

diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index bd357a9..6d31126 100644 (file)
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -1105,7 +1105,7 @@ bge_init_rx_ring_std(struct bge_softc *sc)
                error = bge_newbuf_std(sc, i, 1);
                if (error)
                        return error;
-       };
+       }
 
        sc->bge_std = BGE_STD_RX_RING_CNT - 1;
        bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, sc->bge_std);
@@ -1142,7 +1142,7 @@ bge_init_rx_ring_jumbo(struct bge_softc *sc)
                error = bge_newbuf_jumbo(sc, i, 1);
                if (error)
                        return error;
-       };
+       }
 
        sc->bge_jumbo = BGE_JUMBO_RX_RING_CNT - 1;
 

diff --git a/sys/dev/netif/bnx/if_bnx.c b/sys/dev/netif/bnx/if_bnx.c
index 66cffab..9848b50 100644 (file)
--- a/sys/dev/netif/bnx/if_bnx.c
+++ b/sys/dev/netif/bnx/if_bnx.c
@@ -909,7 +909,7 @@ bnx_init_rx_ring_std(struct bnx_softc *sc)
                error = bnx_newbuf_std(sc, i, 1);
                if (error)
                        return error;
-       };
+       }
 
        sc->bnx_std = BGE_STD_RX_RING_CNT - 1;
        bnx_writembx(sc, BGE_MBX_RX_STD_PROD_LO, sc->bnx_std);
@@ -946,7 +946,7 @@ bnx_init_rx_ring_jumbo(struct bnx_softc *sc)
                error = bnx_newbuf_jumbo(sc, i, 1);
                if (error)
                        return error;
-       };
+       }
 
        sc->bnx_jumbo = BGE_JUMBO_RX_RING_CNT - 1;
 

diff --git a/sys/dev/netif/ixgbe/ixgbe_common.c b/sys/dev/netif/ixgbe/ixgbe_common.c
index 12bfb0c..f110208 100644 (file)
--- a/sys/dev/netif/ixgbe/ixgbe_common.c
+++ b/sys/dev/netif/ixgbe/ixgbe_common.c
@@ -1633,7 +1633,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)
 
                usec_delay(5);
                ixgbe_standby_eeprom(hw);
-       };
+       }
 
        /*
         * On some parts, SPI write time could vary from 0-20mSec on 3.3V
@@ -1719,7 +1719,7 @@ static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
                 * EEPROM
                 */
                mask = mask >> 1;
-       };
+       }
 
        /* We leave the "DI" bit set to "0" when we leave this routine. */
        eec &= ~IXGBE_EEC_DI;

diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index 5dd6fe0..eaa3cdc 100644 (file)
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -830,7 +830,7 @@ ti_init_rx_ring_std(struct ti_softc *sc)
        for (i = 0; i < TI_SSLOTS; i++) {
                if (ti_newbuf_std(sc, i, NULL) == ENOBUFS)
                        return(ENOBUFS);
-       };
+       }
 
        TI_UPDATE_STDPROD(sc, i - 1);
        sc->ti_std = i - 1;

diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 8ee319b..89129ee 100644 (file)
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -685,7 +685,7 @@ vm_pageout_map_deactivate_pages(vm_map_t map, vm_pindex_t desired)
                        break;
                }
                tmpe = tmpe->next;
-       };
+       }
 
        /*
         * Remove all mappings if a process is swapped out, this will free page

diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 7315cd0..0de7d61 100644 (file)
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -33,7 +33,6 @@
  * @(#) Copyright (c) 1989, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)calendar.c  8.3 (Berkeley) 3/25/94
  * $FreeBSD: src/usr.bin/calendar/io.c,v 1.21 2007/06/09 05:54:13 grog Exp $
- * $DragonFly: src/usr.bin/calendar/io.c,v 1.7 2007/09/24 20:49:09 pavalos Exp $
  */
 
 #include <sys/types.h>
@@ -363,7 +362,7 @@ opencal(void)
                if (setuid(getuid()) < 0) {
                        warnx("first setuid failed");
                        _exit(EXIT_FAILURE);
-               };
+               }
                if (setgid(getegid()) < 0) {
                        warnx("setgid failed");
                        _exit(EXIT_FAILURE);
@@ -426,7 +425,7 @@ closecal(FILE *fp)
                if (setuid(getuid()) < 0) {
                        warnx("setuid failed");
                        _exit(EXIT_FAILURE);
-               };
+               }
                if (setgid(getegid()) < 0) {
                        warnx("setgid failed");
                        _exit(EXIT_FAILURE);

diff --git a/usr.bin/dfregress/fe/text/fe_text.c b/usr.bin/dfregress/fe/text/fe_text.c
index f4642df..593b108 100644 (file)
--- a/usr.bin/dfregress/fe/text/fe_text.c
+++ b/usr.bin/dfregress/fe/text/fe_text.c
@@ -179,7 +179,7 @@ runlist_parse_detail(void *arg __unused, prop_dictionary_t testcase)
        case RESULT_SIGNALLED:
                printf("Signal: %d\n", testcase_get_signal(testcase));
                break;
-       };
+       }
 
        print_row('-');
        printf("driver sysbuf:\n%s\n", testcase_get_sys_buf(testcase));

diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 213a011..a0151f9 100644 (file)
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -637,7 +637,7 @@ nfs_filestat(struct vnode *vp, struct filestat *fsp)
        case VNON:
        case VBAD:
                return 0;
-       };
+       }
        fsp->mode = mode;
 
        return 1;

diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index f6abe61..0522879 100644 (file)
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -546,7 +546,7 @@ loop:
                if (kread(interesting_off, (char *)&ifnet, sizeof ifnet)) {
                        printf("???\n");
                        exit(1);
-               };
+               }
                if (!first) {
                        printf("%10lu %5lu %10lu %10lu %5lu %10lu %5lu",
                                ifnet.if_ipackets - ip->ift_ip,

diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 4f0be04..b61427d 100644 (file)
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -28,7 +28,6 @@
  *
  * @(#)rpc_cout.c      1.14    93/07/05 SMI; 1.13 89/02/22 (C) 1987 SMI
  * $FreeBSD: src/usr.bin/rpcgen/rpc_cout.c,v 1.17 2007/11/20 01:46:12 jb Exp $
- * $DragonFly: src/usr.bin/rpcgen/rpc_cout.c,v 1.5 2008/10/16 01:52:33 swildner Exp $
  */
 
 /*
@@ -75,7 +74,7 @@ emit(definition *def)
 
                if (strcmp(def->def.ty.old_type, def->def_name) == 0)
                        return;
-       };
+       }
        print_header(def);
        switch (def->def_kind) {
        case DEF_UNION:

diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index faf3395..4621634 100644 (file)
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -529,7 +529,7 @@ write_program(definition *def, const char *storage)
                        sprintf(_errbuf, "unable to free results");
                        print_err_message("\t\t");
                        f_print(fout, "\n");
-               };
+               }
                print_return("\t");
                f_print(fout, "}\n");
        }

diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 0fa10c8..43f90fc 100644 (file)
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -36,7 +36,6 @@
  * @(#) Copyright (c) 1989, 1993, 1995 The Regents of the University of California.  All rights reserved.
  * @(#)showmount.c     8.3 (Berkeley) 3/29/95
  * $FreeBSD: src/usr.bin/showmount/showmount.c,v 1.16 2005/05/21 09:55:08 ru Exp $
- * $DragonFly: src/usr.bin/showmount/showmount.c,v 1.5 2005/09/05 04:22:07 swildner Exp $
  */
 
 #include <sys/types.h>
@@ -173,7 +172,7 @@ main(int argc, char **argv)
                default:
                        printf("Hosts on %s:\n", host);
                        break;
-               };
+               }
                print_dump(mntdump);
        }
        if (rpcs & DOEXPORTS) {
@@ -285,7 +284,7 @@ xdr_mntdump(XDR *xdrsp, struct mountlist **mlp)
                                                goto next;
                                        }
                                        break;
-                               };
+                               }
                                if (val < 0) {
                                        otp = &tp->ml_left;
                                        tp = tp->ml_left;
@@ -375,7 +374,7 @@ print_dump(struct mountlist *mp)
        default:
                printf("%s\n", mp->ml_host);
                break;
-       };
+       }
        if (mp->ml_right)
                print_dump(mp->ml_right);
 }

diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c
index 05888ad..cf66f9a 100644 (file)
--- a/usr.bin/xlint/lint1/func.c
+++ b/usr.bin/xlint/lint1/func.c
@@ -29,8 +29,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $DragonFly: src/usr.bin/xlint/lint1/func.c,v 1.3 2004/07/07 12:13:26 asmodai Exp $
  */
 
 #include <stdlib.h>
@@ -503,7 +501,7 @@ label(int typ, sym_t *sym, tnode_t *tn)
                        ci->c_default = 1;
                }
                break;
-       };
+       }
        reached = 1;
 }
 

diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 7dd59cb..2d66394 100644 (file)
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -133,7 +133,7 @@ main(int argc, char *argv[])
                        argc--, argv++;
                else
                        readstd = 0;
-       };
+       }
        flushsh();
        if (cflg == 0)
                xsdotc();

diff --git a/usr.sbin/installer/dfuibe_installer/flow.c b/usr.sbin/installer/dfuibe_installer/flow.c
index 934a11a..68127c6 100644 (file)
--- a/usr.sbin/installer/dfuibe_installer/flow.c
+++ b/usr.sbin/installer/dfuibe_installer/flow.c
@@ -1447,7 +1447,7 @@ state_setup_remote_installation_server(struct i_fn_args *a)
 
                        break;
 
-       };
+       }
 
        state = state_welcome;
 

diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 92d1bb0..bb7b645 100644 (file)
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -28,7 +28,6 @@
  *
  * @(#)keyserv.c       1.15    94/04/25 SMI
  * $FreeBSD: src/usr.sbin/keyserv/keyserv.c,v 1.12 2007/11/07 10:53:35 kevlo Exp $
- * $DragonFly: src/usr.sbin/keyserv/keyserv.c,v 1.6 2004/12/18 22:48:03 swildner Exp $
  */
 
 /*
@@ -397,7 +396,7 @@ key_net_put_2_svc_prog(uid_t uid, key_netstarg *arg)
                        arg->st_netname, (int)sizeof (arg->st_pub_key),
                        arg->st_pub_key, (int)sizeof (arg->st_priv_key),
                        arg->st_priv_key);
-       };
+       }
 
        status = pk_netput(uid, arg);
 

diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index 6c12c8d..19e1f92 100644 (file)
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -946,7 +946,7 @@ radius_Account(struct radius *r, struct radacct *ac, struct datalink *dl,
     /* Fetch IP, netmask from IPCP */
     memcpy(&ac->ip, peer_ip, sizeof(ac->ip));
     memcpy(&ac->mask, netmask, sizeof(ac->mask));
-  };
+  }
 
   if (rad_put_string(r->cx.rad, RAD_USER_NAME, ac->user_name) != 0 ||
       rad_put_int(r->cx.rad, RAD_SERVICE_TYPE, RAD_FRAMED) != 0 ||