From: Sascha Wildner Date: Wed, 21 Nov 2012 17:13:43 +0000 (+0100) Subject: Remove some duplicated semicolons (mostly in the kernel). X-Git-Tag: v3.4.0rc~813 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/3598cc148acd8b5b528ae01060c3f974e6692bfc?ds=sidebyside Remove some duplicated semicolons (mostly in the kernel). --- diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c index 0615ccfda6..9d742e6afd 100644 --- a/lib/libc/net/ip6opt.c +++ b/lib/libc/net/ip6opt.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/net/ip6opt.c,v 1.8 2005/07/19 18:13:58 ume Exp $ - * $DragonFly: src/lib/libc/net/ip6opt.c,v 1.6 2007/05/29 10:58:11 hasso Exp $ */ #include @@ -460,7 +459,7 @@ inet6_opt_append(void *extbuf, socklen_t extlen, int offset, u_int8_t type, int inet6_opt_finish(void *extbuf, socklen_t extlen, int offset) { - int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0;; + int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0; if (extbuf) { u_int8_t *padp; diff --git a/lib/libtelnet/encrypt.c b/lib/libtelnet/encrypt.c index 8684ce3607..4f7757064b 100644 --- a/lib/libtelnet/encrypt.c +++ b/lib/libtelnet/encrypt.c @@ -920,7 +920,7 @@ encrypt_gen_printsub(unsigned char *data, int cnt, unsigned char *buf, int bufle data += 2; buf[buflen-1] = '\0'; buf[buflen-2] = '*'; - buflen -= 2;; + buflen -= 2; for (; cnt > 0; cnt--, data++) { sprintf(tbuf, " %d", *data); for (cp = tbuf; *cp && buflen > 0; --buflen) diff --git a/sbin/hammer2/cmd_remote.c b/sbin/hammer2/cmd_remote.c index 97116b1805..499b9e9083 100644 --- a/sbin/hammer2/cmd_remote.c +++ b/sbin/hammer2/cmd_remote.c @@ -58,7 +58,7 @@ cmd_remote_connect(const char *sel_path, const char *url) ecode = 1; } close(fd); - return 0;; + return 0; } int @@ -84,7 +84,7 @@ cmd_remote_disconnect(const char *sel_path, const char *url) ecode = 1; } close(fd); - return 0;; + return 0; } int diff --git a/sys/dev/disk/iscsi/initiator/isc_sm.c b/sys/dev/disk/iscsi/initiator/isc_sm.c index 0718c0fbeb..62b8dc15fd 100644 --- a/sys/dev/disk/iscsi/initiator/isc_sm.c +++ b/sys/dev/disk/iscsi/initiator/isc_sm.c @@ -401,7 +401,7 @@ ism_recv(isc_session_t *sp, pduq_t *pq) if(sp->flags & ISC_STALLED) { sdebug(4, "window opened: max=0x%x exp=0x%x opcode=0x%x cmd=0x%x cws=%d.", sn->maxCmd, sn->expCmd, bhs->opcode, sn->cmd, sp->cws); - sp->flags &= ~ISC_STALLED;; + sp->flags &= ~ISC_STALLED; } } } diff --git a/sys/dev/disk/nata/ata-raid.c b/sys/dev/disk/nata/ata-raid.c index 8438614d79..23f642a232 100644 --- a/sys/dev/disk/nata/ata-raid.c +++ b/sys/dev/disk/nata/ata-raid.c @@ -431,7 +431,7 @@ ata_raid_strategy(struct dev_strategy_args *ap) if (rdp->status & AR_S_REBUILDING) blk = ((lba / rdp->interleave) * rdp->width) * rdp->interleave + (rdp->interleave * (drv % rdp->width)) + - lba % rdp->interleave;; + lba % rdp->interleave; if (bbp->b_cmd == BUF_CMD_READ) { int src_online = diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c index 2eb615ebfa..4a5ea33232 100644 --- a/sys/dev/netif/mxge/if_mxge.c +++ b/sys/dev/netif/mxge/if_mxge.c @@ -3207,7 +3207,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d allocating rx_small dmat\n", err); - return err;; + return err; } err = bus_dma_tag_create(sc->parent_dmat, /* parent */ @@ -3233,7 +3233,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d allocating rx_big dmat\n", err); - return err;; + return err; } for (i = 0; i <= ss->rx_small.mask; i++) { err = bus_dmamap_create(ss->rx_small.dmat, 0, @@ -3241,7 +3241,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d rx_small dmamap\n", err); - return err;; + return err; } } err = bus_dmamap_create(ss->rx_small.dmat, 0, @@ -3249,7 +3249,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d extra rx_small dmamap\n", err); - return err;; + return err; } for (i = 0; i <= ss->rx_big.mask; i++) { @@ -3258,7 +3258,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d rx_big dmamap\n", err); - return err;; + return err; } } err = bus_dmamap_create(ss->rx_big.dmat, 0, @@ -3266,7 +3266,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d extra rx_big dmamap\n", err); - return err;; + return err; } /* now allocate TX resouces */ @@ -3294,7 +3294,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, ss->tx.seg_list = (bus_dma_segment_t *) kmalloc(bytes, M_DEVBUF, M_WAITOK); if (ss->tx.seg_list == NULL) - return err;; + return err; /* allocate the tx host info ring */ bytes = tx_ring_entries * sizeof (*ss->tx.info); @@ -3316,7 +3316,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d allocating tx dmat\n", err); - return err;; + return err; } /* now use these tags to setup dmamaps for each slot @@ -3327,7 +3327,7 @@ mxge_alloc_slice_rings(struct mxge_slice_state *ss, int rx_ring_entries, if (err != 0) { device_printf(sc->dev, "Err %d tx dmamap\n", err); - return err;; + return err; } } return 0; diff --git a/sys/dev/raid/hpt27xx/os_bsd.c b/sys/dev/raid/hpt27xx/os_bsd.c index c89856b641..4ddc8ccbe9 100644 --- a/sys/dev/raid/hpt27xx/os_bsd.c +++ b/sys/dev/raid/hpt27xx/os_bsd.c @@ -84,7 +84,7 @@ HPT_U8 pcicfg_read_byte (HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg) } HPT_U32 pcicfg_read_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg) { - return (HPT_U32)pci_cfgregread(bus, dev, func, reg, 4);; + return (HPT_U32)pci_cfgregread(bus, dev, func, reg, 4); } void pcicfg_write_byte (HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg, HPT_U8 v) { diff --git a/sys/dev/raid/mps/mps_sas.c b/sys/dev/raid/mps/mps_sas.c index 7b32e084b4..d164fccd88 100644 --- a/sys/dev/raid/mps/mps_sas.c +++ b/sys/dev/raid/mps/mps_sas.c @@ -1708,7 +1708,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm) if (cm->cm_flags & MPS_CM_FLAGS_DATAIN) dir = BUS_DMASYNC_POSTREAD; else if (cm->cm_flags & MPS_CM_FLAGS_DATAOUT) - dir = BUS_DMASYNC_POSTWRITE;; + dir = BUS_DMASYNC_POSTWRITE; bus_dmamap_sync(sc->buffer_dmat, cm->cm_dmamap, dir); bus_dmamap_unload(sc->buffer_dmat, cm->cm_dmamap); } diff --git a/sys/dev/raid/mps/mps_user.c b/sys/dev/raid/mps/mps_user.c index 5370d1dcb5..54716098bc 100644 --- a/sys/dev/raid/mps/mps_user.c +++ b/sys/dev/raid/mps/mps_user.c @@ -989,7 +989,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) if (cm->cm_flags & MPS_CM_FLAGS_DATAIN) dir = BUS_DMASYNC_POSTREAD; else if (cm->cm_flags & MPS_CM_FLAGS_DATAOUT) - dir = BUS_DMASYNC_POSTWRITE;; + dir = BUS_DMASYNC_POSTWRITE; bus_dmamap_sync(sc->buffer_dmat, cm->cm_dmamap, dir); bus_dmamap_unload(sc->buffer_dmat, cm->cm_dmamap); diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index cfe32127fb..a62b104312 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -349,7 +349,7 @@ m3_wrcd(kobj_t kobj, void *devinfo, int regno, u_int32_t data) struct sc_info *sc = (struct sc_info *)devinfo; if (m3_wait(sc)) { device_printf(sc->dev, "m3_wrcd timed out.\n"); - return -1;; + return -1; } m3_wr_2(sc, CODEC_DATA, data); m3_wr_1(sc, CODEC_COMMAND, regno & 0x7f); diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index e70c7fd3ed..c6b33c4f5e 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -38,7 +38,6 @@ * * @(#)kern_acct.c 8.1 (Berkeley) 6/14/93 * $FreeBSD: src/sys/kern/kern_acct.c,v 1.23.2.1 2002/07/24 18:33:55 johan Exp $ - * $DragonFly: src/sys/kern/kern_acct.c,v 1.28 2008/05/08 01:26:00 dillon Exp $ */ #include @@ -233,7 +232,7 @@ acct_process(struct proc *p) /* (4) The average amount of memory used */ r = &p->p_ru; - tmp = ru.ru_utime;; + tmp = ru.ru_utime; timevaladd(&tmp, &ru.ru_stime); t = tmp.tv_sec * hz + tmp.tv_usec / ustick; if (t) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index b4019cb506..dc5da33a54 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -718,7 +718,7 @@ lwp_exit(int masterexit) static int lwp_wait(struct lwp *lp) { - struct thread *td = lp->lwp_thread;; + struct thread *td = lp->lwp_thread; u_int mpflags; KKASSERT(lwkt_preempted_proc() != lp); @@ -785,7 +785,7 @@ lwp_wait(struct lwp *lp) void lwp_dispose(struct lwp *lp) { - struct thread *td = lp->lwp_thread;; + struct thread *td = lp->lwp_thread; KKASSERT(lwkt_preempted_proc() != lp); KKASSERT(td->td_refs == 0); diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index d49d495875..3a91d2ed01 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -462,7 +462,7 @@ linker_make_file(const char* pathname, void* priv, struct linker_file_ops* ops) int linker_file_unload(linker_file_t file) { - module_t mod, next;; + module_t mod, next; modlist_t ml, nextml; struct common_symbol* cp; int error = 0; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 07ecbfd9c9..8ae55409ed 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3390,7 +3390,7 @@ vn_fullpath(struct proc *p, struct vnode *vn, char **retbuf, char **freebuf, spin_unlock(&vn->v_spin); atomic_add_int(&numfullpathcalls, -1); - nch.ncp = ncp;; + nch.ncp = ncp; nch.mount = vn->v_mount; error = cache_fullpath(p, &nch, NULL, retbuf, freebuf, guess); _cache_drop(ncp); diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 7550d7c6ed..95120aaa95 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -277,7 +277,7 @@ netmsg_service_loop(void *arg) { struct netmsg_rollup *ru; netmsg_base_t msg; - thread_t td = curthread;; + thread_t td = curthread; int limit; while ((msg = lwkt_waitport(&td->td_msgport, 0))) { diff --git a/sys/net/pf/if_pfsync.c b/sys/net/pf/if_pfsync.c index 2cd430be4b..4c986bd8ae 100644 --- a/sys/net/pf/if_pfsync.c +++ b/sys/net/pf/if_pfsync.c @@ -1318,7 +1318,7 @@ pfsync_pack_state(u_int8_t action, struct pf_state *st, int flags) } } - st->pfsync_time = mycpu->gd_time_seconds;; + st->pfsync_time = mycpu->gd_time_seconds; if (sp == NULL) { /* not a "duplicate" update */ diff --git a/sys/netbt/l2cap_misc.c b/sys/netbt/l2cap_misc.c index 7e04724e6f..0b63067cc2 100644 --- a/sys/netbt/l2cap_misc.c +++ b/sys/netbt/l2cap_misc.c @@ -1,4 +1,3 @@ -/* $DragonFly: src/sys/netbt/l2cap_misc.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */ /* $OpenBSD: src/sys/netbt/l2cap_misc.c,v 1.3 2008/02/24 21:34:48 uwe Exp $ */ /* $NetBSD: l2cap_misc.c,v 1.5 2007/11/03 17:20:17 plunky Exp $ */ @@ -71,7 +70,6 @@ int l2cap_response_extended_timeout = 180; /* seconds */ void l2cap_init(void) { - ;; } /* diff --git a/sys/netbt/rfcomm_socket.c b/sys/netbt/rfcomm_socket.c index 18bf2d53dc..3357d13d7d 100644 --- a/sys/netbt/rfcomm_socket.c +++ b/sys/netbt/rfcomm_socket.c @@ -1,4 +1,3 @@ -/* $DragonFly: src/sys/netbt/rfcomm_socket.c,v 1.3 2008/06/20 20:52:29 aggelos Exp $ */ /* $OpenBSD: src/sys/netbt/rfcomm_socket.c,v 1.2 2008/02/24 21:34:48 uwe Exp $ */ /* $NetBSD: rfcomm_socket.c,v 1.8 2007/10/15 18:04:34 plunky Exp $ */ @@ -388,7 +387,7 @@ rfcomm_speeraddr(netmsg_t msg) bzero(sa, sizeof *sa); sa->bt_len = sizeof(struct sockaddr_bt); sa->bt_family = AF_BLUETOOTH; - error = rfcomm_peeraddr(pcb, sa);; + error = rfcomm_peeraddr(pcb, sa); *nam = dup_sockaddr((struct sockaddr *)sa); lwkt_replymsg(&msg->peeraddr.base.lmsg, error); @@ -407,7 +406,7 @@ rfcomm_ssockaddr(netmsg_t msg) bzero(sa, sizeof *sa); sa->bt_len = sizeof(struct sockaddr_bt); sa->bt_family = AF_BLUETOOTH; - error = rfcomm_sockaddr(pcb, sa);; + error = rfcomm_sockaddr(pcb, sa); *nam = dup_sockaddr((struct sockaddr *)sa); lwkt_replymsg(&msg->sockaddr.base.lmsg, error); @@ -463,7 +462,7 @@ rfcomm_saccept(netmsg_t msg) bzero(sa, sizeof *sa); sa->bt_len = sizeof(struct sockaddr_bt); sa->bt_family = AF_BLUETOOTH; - error = rfcomm_peeraddr(pcb, sa);; + error = rfcomm_peeraddr(pcb, sa); *nam = dup_sockaddr((struct sockaddr *)sa); lwkt_replymsg(&msg->accept.base.lmsg, error); diff --git a/sys/netbt/sco_socket.c b/sys/netbt/sco_socket.c index e3481f842f..41deadc7ca 100644 --- a/sys/netbt/sco_socket.c +++ b/sys/netbt/sco_socket.c @@ -233,7 +233,7 @@ sco_input(void *arg, struct mbuf *m) static void sco_sdetach(netmsg_t msg) { - struct socket *so = msg->detach.base.nm_so;; + struct socket *so = msg->detach.base.nm_so; int error; error = sco_detach((struct sco_pcb **)&so->so_pcb); diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index c822786afc..5abeaa1941 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -513,7 +513,7 @@ freectl: void rip6_ctloutput(netmsg_t msg) { - struct socket *so = msg->ctloutput.base.nm_so;; + struct socket *so = msg->ctloutput.base.nm_so; struct sockopt *sopt = msg->ctloutput.nm_sopt; int error; diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 8f27b6f940..89686e1efd 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -1523,7 +1523,7 @@ sctp6_peeraddr(struct socket *so, struct mbuf *nam) static void sctp6_in6getaddr(netmsg_t msg) { - struct socket *so = msg->sockaddr.base.nm_so;; + struct socket *so = msg->sockaddr.base.nm_so; struct sockaddr **nam = msg->sockaddr.nm_nam; struct sockaddr *addr; struct in6pcb *inp6 = sotoin6pcb(so); diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c index 4fe8102110..d4c8d95825 100644 --- a/usr.sbin/rpc.lockd/lockd_lock.c +++ b/usr.sbin/rpc.lockd/lockd_lock.c @@ -428,7 +428,7 @@ do_lock(struct file_lock *fl, int block) syslog(LOG_NOTICE, "fhopen failed (from %s): %s", fl->client_name, strerror(errno)); LIST_REMOVE(fl, lcklst); - return error;; + return error; } if (fstat(fl->fd, &st) < 0) { syslog(LOG_NOTICE, "fstat failed (from %s): %s",