From owner-svn-src-stable-9@FreeBSD.ORG Sun Nov 4 01:21:50 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48717249; Sun, 4 Nov 2012 01:21:50 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 282028FC12; Sun, 4 Nov 2012 01:21:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA41LoOp084673; Sun, 4 Nov 2012 01:21:50 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA41LnGS084649; Sun, 4 Nov 2012 01:21:49 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211040121.qA41LnGS084649@svn.freebsd.org> From: Eitan Adler Date: Sun, 4 Nov 2012 01:21:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r242544 - in stable/9: lib/libc/net lib/libdwarf lib/libpam/modules/pam_krb5 sbin/ddb sbin/natd sys/cam/ctl sys/dev/cxgb sys/dev/e1000 sys/dev/hpt27xx sys/dev/mps sys/dev/oce sys/dev/so... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2012 01:21:50 -0000 Author: eadler Date: Sun Nov 4 01:21:49 2012 New Revision: 242544 URL: http://svn.freebsd.org/changeset/base/242544 Log: MFC r241844: remove duplicate semicolons where possible. Approved by: cperciva (implicit) Modified: stable/9/lib/libc/net/ip6opt.c stable/9/lib/libdwarf/dwarf_init.c stable/9/lib/libpam/modules/pam_krb5/pam_krb5.c stable/9/sbin/ddb/ddb.c stable/9/sbin/natd/natd.c stable/9/sys/cam/ctl/ctl.c stable/9/sys/dev/cxgb/cxgb_main.c stable/9/sys/dev/e1000/if_lem.c stable/9/sys/dev/hpt27xx/os_bsd.c stable/9/sys/dev/mps/mps_sas.c stable/9/sys/dev/mps/mps_user.c stable/9/sys/dev/oce/oce_if.c stable/9/sys/dev/sound/pci/hda/hdaa.c stable/9/sys/kern/sched_ule.c stable/9/sys/mips/rmi/xlr_i2c.c stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c stable/9/sys/ofed/drivers/net/mlx4/en_rx.c stable/9/tools/regression/lib/libc/nss/test-gethostby.c stable/9/tools/regression/sockets/unix_cmsg/unix_cmsg.c stable/9/usr.sbin/diskinfo/diskinfo.c stable/9/usr.sbin/ppp/radius.c Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libdwarf/ (props changed) stable/9/lib/libpam/ (props changed) stable/9/sbin/ddb/ (props changed) stable/9/sbin/natd/ (props changed) stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/fs/ (props changed) stable/9/tools/regression/lib/libc/ (props changed) stable/9/tools/regression/sockets/ (props changed) stable/9/usr.sbin/diskinfo/ (props changed) stable/9/usr.sbin/ppp/ (props changed) Modified: stable/9/lib/libc/net/ip6opt.c ============================================================================== --- stable/9/lib/libc/net/ip6opt.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/lib/libc/net/ip6opt.c Sun Nov 4 01:21:49 2012 (r242544) @@ -461,7 +461,7 @@ inet6_opt_append(void *extbuf, socklen_t 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; Modified: stable/9/lib/libdwarf/dwarf_init.c ============================================================================== --- stable/9/lib/libdwarf/dwarf_init.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/lib/libdwarf/dwarf_init.c Sun Nov 4 01:21:49 2012 (r242544) @@ -551,7 +551,7 @@ dwarf_init_info(Dwarf_Debug dbg, Dwarf_E Dwarf_Attribute at; Dwarf_Die die; uint64_t abnum; - uint64_t die_offset = offset;; + uint64_t die_offset = offset; abnum = dwarf_read_uleb128(&d, &offset); Modified: stable/9/lib/libpam/modules/pam_krb5/pam_krb5.c ============================================================================== --- stable/9/lib/libpam/modules/pam_krb5/pam_krb5.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/lib/libpam/modules/pam_krb5/pam_krb5.c Sun Nov 4 01:21:49 2012 (r242544) @@ -633,7 +633,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int if (krbret != 0) { PAM_LOG("Error krb5_cc_get_principal(): %s", krb5_get_err_text(pam_context, krbret)); - retval = PAM_PERM_DENIED;; + retval = PAM_PERM_DENIED; goto cleanup; } Modified: stable/9/sbin/ddb/ddb.c ============================================================================== --- stable/9/sbin/ddb/ddb.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sbin/ddb/ddb.c Sun Nov 4 01:21:49 2012 (r242544) @@ -80,7 +80,7 @@ ddb_readfile(char *filename) argc++; spn = strcspn(argv[0], WHITESP); - argv[1] = argv[0] + spn + strspn(argv[0] + spn, WHITESP);; + argv[1] = argv[0] + spn + strspn(argv[0] + spn, WHITESP); argv[0][spn] = '\0'; if (*argv[1] != '\0') argc++; Modified: stable/9/sbin/natd/natd.c ============================================================================== --- stable/9/sbin/natd/natd.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sbin/natd/natd.c Sun Nov 4 01:21:49 2012 (r242544) @@ -1509,7 +1509,7 @@ static void ParseOption (const char* opt break; case LogIpfwDenied: - logIpfwDenied = yesNoValue;; + logIpfwDenied = yesNoValue; break; case PidFile: Modified: stable/9/sys/cam/ctl/ctl.c ============================================================================== --- stable/9/sys/cam/ctl/ctl.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/cam/ctl/ctl.c Sun Nov 4 01:21:49 2012 (r242544) @@ -480,7 +480,7 @@ ctl_isc_handler_finish_xfer(struct ctl_s memcpy(&ctsio->sense_data, &msg_info->scsi.sense_data, sizeof(ctsio->sense_data)); memcpy(&ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes, - &msg_info->scsi.lbalen, sizeof(msg_info->scsi.lbalen));; + &msg_info->scsi.lbalen, sizeof(msg_info->scsi.lbalen)); STAILQ_INSERT_TAIL(&ctl_softc->isc_queue, &ctsio->io_hdr, links); ctl_wakeup_thread(); } @@ -12681,7 +12681,7 @@ ctl_process_done(union ctl_io *io, int h */ memcpy(&msg.scsi.lbalen, &io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes, - sizeof(msg.scsi.lbalen));; + sizeof(msg.scsi.lbalen)); if (ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg, sizeof(msg), 0) > CTL_HA_STATUS_SUCCESS) { Modified: stable/9/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/9/sys/dev/cxgb/cxgb_main.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/dev/cxgb/cxgb_main.c Sun Nov 4 01:21:49 2012 (r242544) @@ -2984,7 +2984,7 @@ cxgb_extension_ioctl(struct cdev *dev, u break; } case CHELSIO_SET_FILTER: { - struct ch_filter *f = (struct ch_filter *)data;; + struct ch_filter *f = (struct ch_filter *)data; struct filter_info *p; unsigned int nfilters = sc->params.mc5.nfilters; Modified: stable/9/sys/dev/e1000/if_lem.c ============================================================================== --- stable/9/sys/dev/e1000/if_lem.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/dev/e1000/if_lem.c Sun Nov 4 01:21:49 2012 (r242544) @@ -3455,7 +3455,7 @@ lem_free_receive_structures(struct adapt static bool lem_rxeof(struct adapter *adapter, int count, int *done) { - struct ifnet *ifp = adapter->ifp;; + struct ifnet *ifp = adapter->ifp; struct mbuf *mp; u8 status = 0, accept_frame = 0, eop = 0; u16 len, desc_len, prev_len_adj; Modified: stable/9/sys/dev/hpt27xx/os_bsd.c ============================================================================== --- stable/9/sys/dev/hpt27xx/os_bsd.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/dev/hpt27xx/os_bsd.c Sun Nov 4 01:21:49 2012 (r242544) @@ -133,7 +133,7 @@ HPT_U8 pcicfg_read_byte (HPT_U8 bus, HPT } 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) { Modified: stable/9/sys/dev/mps/mps_sas.c ============================================================================== --- stable/9/sys/dev/mps/mps_sas.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/dev/mps/mps_sas.c Sun Nov 4 01:21:49 2012 (r242544) @@ -2020,7 +2020,7 @@ mpssas_scsiio_complete(struct mps_softc 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); } Modified: stable/9/sys/dev/mps/mps_user.c ============================================================================== --- stable/9/sys/dev/mps/mps_user.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/dev/mps/mps_user.c Sun Nov 4 01:21:49 2012 (r242544) @@ -1000,7 +1000,7 @@ mps_user_pass_thru(struct mps_softc *sc, 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); Modified: stable/9/sys/dev/oce/oce_if.c ============================================================================== --- stable/9/sys/dev/oce/oce_if.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/dev/oce/oce_if.c Sun Nov 4 01:21:49 2012 (r242544) @@ -256,7 +256,7 @@ oce_attach(device_t dev) rc = oce_hw_start(sc); if (rc) - goto lro_free;; + goto lro_free; sc->vlan_attach = EVENTHANDLER_REGISTER(vlan_config, Modified: stable/9/sys/dev/sound/pci/hda/hdaa.c ============================================================================== --- stable/9/sys/dev/sound/pci/hda/hdaa.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/dev/sound/pci/hda/hdaa.c Sun Nov 4 01:21:49 2012 (r242544) @@ -1148,7 +1148,7 @@ hdaa_widget_parse(struct hdaa_widget *w) w->wclass.pin.config = hda_command(dev, HDA_CMD_GET_CONFIGURATION_DEFAULT(0, w->nid)); w->wclass.pin.cap = hda_command(dev, - HDA_CMD_GET_PARAMETER(0, w->nid, HDA_PARAM_PIN_CAP));; + HDA_CMD_GET_PARAMETER(0, w->nid, HDA_PARAM_PIN_CAP)); w->wclass.pin.ctrl = hda_command(dev, HDA_CMD_GET_PIN_WIDGET_CTRL(0, nid)); if (HDA_PARAM_PIN_CAP_EAPD_CAP(w->wclass.pin.cap)) { Modified: stable/9/sys/kern/sched_ule.c ============================================================================== --- stable/9/sys/kern/sched_ule.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/kern/sched_ule.c Sun Nov 4 01:21:49 2012 (r242544) @@ -202,7 +202,7 @@ static struct td_sched td_sched0; */ static int sched_interact = SCHED_INTERACT_THRESH; static int realstathz = 127; -static int tickincr = 8 << SCHED_TICK_SHIFT;; +static int tickincr = 8 << SCHED_TICK_SHIFT; static int sched_slice = 12; #ifdef PREEMPTION #ifdef FULL_PREEMPTION Modified: stable/9/sys/mips/rmi/xlr_i2c.c ============================================================================== --- stable/9/sys/mips/rmi/xlr_i2c.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/mips/rmi/xlr_i2c.c Sun Nov 4 01:21:49 2012 (r242544) @@ -332,7 +332,7 @@ retry: continue; if (pos >= len) - break;; + break; } *sent = len - 1; return 0; Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ============================================================================== --- stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c Sun Nov 4 01:21:49 2012 (r242544) @@ -723,7 +723,7 @@ void ipoib_mcast_restart_task(struct wor void ipoib_mcast_restart(struct ipoib_dev_priv *priv) { struct ifnet *dev = priv->dev; - struct ifmultiaddr *ifma;; + struct ifmultiaddr *ifma; struct ipoib_mcast *mcast, *tmcast; LIST_HEAD(remove_list); struct ib_sa_mcmember_rec rec; Modified: stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/ofed/drivers/net/mlx4/en_netdev.c Sun Nov 4 01:21:49 2012 (r242544) @@ -101,7 +101,7 @@ u64 mlx4_en_mac_to_u64(u8 *addr) static int mlx4_en_cache_mclist(struct net_device *dev, u64 **mcaddrp) { - struct ifmultiaddr *ifma;; + struct ifmultiaddr *ifma; u64 *mcaddr; int cnt; int i; Modified: stable/9/sys/ofed/drivers/net/mlx4/en_rx.c ============================================================================== --- stable/9/sys/ofed/drivers/net/mlx4/en_rx.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/sys/ofed/drivers/net/mlx4/en_rx.c Sun Nov 4 01:21:49 2012 (r242544) @@ -405,7 +405,7 @@ static inline int invalid_cqe(struct mlx } if (unlikely(cqe->badfcs_enc & MLX4_CQE_BAD_FCS)) { en_dbg(RX_ERR, priv, "Accepted frame with bad FCS\n"); - return 1;; + return 1; } return 0; Modified: stable/9/tools/regression/lib/libc/nss/test-gethostby.c ============================================================================== --- stable/9/tools/regression/lib/libc/nss/test-gethostby.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/tools/regression/lib/libc/nss/test-gethostby.c Sun Nov 4 01:21:49 2012 (r242544) @@ -565,7 +565,7 @@ hostent_read_snapshot_addr(char *addr, u static int hostent_read_snapshot_func(struct hostent *ht, char *line) { - StringList *sl1, *sl2;; + StringList *sl1, *sl2; char *s, *ps, *ts; int i, rv; Modified: stable/9/tools/regression/sockets/unix_cmsg/unix_cmsg.c ============================================================================== --- stable/9/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sun Nov 4 01:21:49 2012 (r242544) @@ -1513,7 +1513,7 @@ t_timestamp_server(int fd1) msg.msg_iov = iov; msg.msg_iovlen = 1; msg.msg_control = control_un.control; - msg.msg_controllen = sizeof control_un.control;; + msg.msg_controllen = sizeof control_un.control; msg.msg_flags = 0; if (recvmsg_timeout(fd2, &msg, sizeof buf) < 0) Modified: stable/9/usr.sbin/diskinfo/diskinfo.c ============================================================================== --- stable/9/usr.sbin/diskinfo/diskinfo.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/usr.sbin/diskinfo/diskinfo.c Sun Nov 4 01:21:49 2012 (r242544) @@ -335,7 +335,7 @@ speeddisk(int fd, off_t mediasize, u_int TR(bulk * 1024); printf("\tinside: "); - b0 = sectorcount - bulk * (1024*1024 / sectorsize) - 1;; + b0 = sectorcount - bulk * (1024*1024 / sectorsize) - 1; rdsect(fd, b0, sectorsize); T0(); for (i = 0; i < bulk; i++) { Modified: stable/9/usr.sbin/ppp/radius.c ============================================================================== --- stable/9/usr.sbin/ppp/radius.c Sun Nov 4 01:20:57 2012 (r242543) +++ stable/9/usr.sbin/ppp/radius.c Sun Nov 4 01:21:49 2012 (r242544) @@ -784,7 +784,7 @@ radius_Init(struct radius *r) r->mppe.recvkeylen = 0; r->mppe.sendkey = NULL; r->mppe.sendkeylen = 0; - *r->cfg.file = '\0';; + *r->cfg.file = '\0'; log_Printf(LogDEBUG, "Radius: radius_Init\n"); }