From owner-svn-src-all@FreeBSD.ORG Sun Nov 4 01:20:01 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C63B2EE7; Sun, 4 Nov 2012 01:20:01 +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 A55B98FC08; Sun, 4 Nov 2012 01:20:01 +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 qA41K1dA084337; Sun, 4 Nov 2012 01:20:01 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA41K1mk084324; Sun, 4 Nov 2012 01:20:01 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211040120.qA41K1mk084324@svn.freebsd.org> From: Eitan Adler Date: Sun, 4 Nov 2012 01:20:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r242542 - in stable/7: lib/libc/net lib/libdwarf lib/libpam/modules/pam_krb5 sbin/ddb sbin/natd sys/dev/cxgb sys/dev/e1000 tools/regression/lib/libc/nss tools/regression/sockets/unix_cm... X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2012 01:20:01 -0000 Author: eadler Date: Sun Nov 4 01:20:00 2012 New Revision: 242542 URL: http://svn.freebsd.org/changeset/base/242542 Log: MFC r241844: remove duplicate semicolons where possible. Approved by: cperciva (implicit) Modified: stable/7/lib/libc/net/ip6opt.c stable/7/lib/libdwarf/dwarf_init.c stable/7/lib/libpam/modules/pam_krb5/pam_krb5.c stable/7/sbin/ddb/ddb.c stable/7/sbin/natd/natd.c stable/7/sys/dev/cxgb/cxgb_main.c stable/7/sys/dev/e1000/if_lem.c stable/7/tools/regression/lib/libc/nss/test-gethostby.c stable/7/tools/regression/sockets/unix_cmsg/unix_cmsg.c stable/7/usr.sbin/diskinfo/diskinfo.c stable/7/usr.sbin/ppp/radius.c Directory Properties: stable/7/lib/libc/ (props changed) stable/7/lib/libdwarf/ (props changed) stable/7/lib/libpam/ (props changed) stable/7/sbin/ddb/ (props changed) stable/7/sbin/natd/ (props changed) stable/7/sys/ (props changed) stable/7/tools/regression/lib/libc/ (props changed) stable/7/tools/regression/sockets/ (props changed) stable/7/usr.sbin/diskinfo/ (props changed) stable/7/usr.sbin/ppp/ (props changed) Modified: stable/7/lib/libc/net/ip6opt.c ============================================================================== --- stable/7/lib/libc/net/ip6opt.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/lib/libc/net/ip6opt.c Sun Nov 4 01:20:00 2012 (r242542) @@ -478,7 +478,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/7/lib/libdwarf/dwarf_init.c ============================================================================== --- stable/7/lib/libdwarf/dwarf_init.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/lib/libdwarf/dwarf_init.c Sun Nov 4 01:20:00 2012 (r242542) @@ -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/7/lib/libpam/modules/pam_krb5/pam_krb5.c ============================================================================== --- stable/7/lib/libpam/modules/pam_krb5/pam_krb5.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/lib/libpam/modules/pam_krb5/pam_krb5.c Sun Nov 4 01:20:00 2012 (r242542) @@ -626,7 +626,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/7/sbin/ddb/ddb.c ============================================================================== --- stable/7/sbin/ddb/ddb.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/sbin/ddb/ddb.c Sun Nov 4 01:20:00 2012 (r242542) @@ -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/7/sbin/natd/natd.c ============================================================================== --- stable/7/sbin/natd/natd.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/sbin/natd/natd.c Sun Nov 4 01:20:00 2012 (r242542) @@ -1471,7 +1471,7 @@ static void ParseOption (const char* opt break; case LogIpfwDenied: - logIpfwDenied = yesNoValue;; + logIpfwDenied = yesNoValue; break; case PidFile: Modified: stable/7/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/7/sys/dev/cxgb/cxgb_main.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/sys/dev/cxgb/cxgb_main.c Sun Nov 4 01:20:00 2012 (r242542) @@ -3124,7 +3124,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/7/sys/dev/e1000/if_lem.c ============================================================================== --- stable/7/sys/dev/e1000/if_lem.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/sys/dev/e1000/if_lem.c Sun Nov 4 01:20:00 2012 (r242542) @@ -3381,7 +3381,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/7/tools/regression/lib/libc/nss/test-gethostby.c ============================================================================== --- stable/7/tools/regression/lib/libc/nss/test-gethostby.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/tools/regression/lib/libc/nss/test-gethostby.c Sun Nov 4 01:20:00 2012 (r242542) @@ -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/7/tools/regression/sockets/unix_cmsg/unix_cmsg.c ============================================================================== --- stable/7/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sun Nov 4 01:20:00 2012 (r242542) @@ -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/7/usr.sbin/diskinfo/diskinfo.c ============================================================================== --- stable/7/usr.sbin/diskinfo/diskinfo.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/usr.sbin/diskinfo/diskinfo.c Sun Nov 4 01:20:00 2012 (r242542) @@ -325,7 +325,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/7/usr.sbin/ppp/radius.c ============================================================================== --- stable/7/usr.sbin/ppp/radius.c Sun Nov 4 01:00:35 2012 (r242541) +++ stable/7/usr.sbin/ppp/radius.c Sun Nov 4 01:20:00 2012 (r242542) @@ -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"); }