aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/libc/net/ip6opt.c2
-rw-r--r--lib/libdwarf/dwarf_init.c2
-rw-r--r--lib/libpam/modules/pam_krb5/pam_krb5.c2
-rw-r--r--sbin/ddb/ddb.c2
-rw-r--r--sbin/natd/natd.c2
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_systimer.c4
-rw-r--r--sys/arm/ti/am335x/am335x_dmtimer.c2
-rw-r--r--sys/cam/ctl/ctl.c4
-rw-r--r--sys/cam/scsi/scsi_enc_ses.c2
-rw-r--r--sys/dev/ahci/ahciem.c2
-rw-r--r--sys/dev/cxgb/cxgb_main.c2
-rw-r--r--sys/dev/e1000/if_lem.c2
-rw-r--r--sys/dev/hpt27xx/os_bsd.c2
-rw-r--r--sys/dev/isf/isf.c2
-rw-r--r--sys/dev/mps/mps_sas.c2
-rw-r--r--sys/dev/mps/mps_user.c2
-rw-r--r--sys/dev/oce/oce_if.c2
-rw-r--r--sys/dev/sound/pci/hda/hdaa.c2
-rw-r--r--sys/dev/usb/net/if_smsc.c2
-rw-r--r--sys/fs/nandfs/nandfs_subr.c2
-rw-r--r--sys/kern/sched_ule.c2
-rw-r--r--sys/mips/rmi/xlr_i2c.c2
-rw-r--r--sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c2
-rw-r--r--sys/ofed/drivers/net/mlx4/en_netdev.c2
-rw-r--r--sys/ofed/drivers/net/mlx4/en_rx.c2
-rw-r--r--tools/regression/lib/libc/nss/test-gethostby.c2
-rw-r--r--tools/regression/sockets/unix_cmsg/unix_cmsg.c2
-rw-r--r--usr.sbin/diskinfo/diskinfo.c2
-rw-r--r--usr.sbin/ppp/radius.c2
29 files changed, 31 insertions, 31 deletions
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index d999fd48fba9..003c625279af 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -461,7 +461,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/libdwarf/dwarf_init.c b/lib/libdwarf/dwarf_init.c
index aca6cef64686..6ebc7d90d688 100644
--- a/lib/libdwarf/dwarf_init.c
+++ b/lib/libdwarf/dwarf_init.c
@@ -551,7 +551,7 @@ dwarf_init_info(Dwarf_Debug dbg, Dwarf_Error *error)
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);
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c
index e547a3ad31c7..19592e3fcdfc 100644
--- a/lib/libpam/modules/pam_krb5/pam_krb5.c
+++ b/lib/libpam/modules/pam_krb5/pam_krb5.c
@@ -650,7 +650,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused,
if (krbret != 0) {
PAM_LOG_KRB5_ERR(pam_context, krbret,
"Error krb5_cc_get_principal()");
- retval = PAM_PERM_DENIED;;
+ retval = PAM_PERM_DENIED;
goto cleanup;
}
diff --git a/sbin/ddb/ddb.c b/sbin/ddb/ddb.c
index 901d494aa28a..edba7f8509a5 100644
--- a/sbin/ddb/ddb.c
+++ b/sbin/ddb/ddb.c
@@ -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++;
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index 631791b18697..959e1eeaf52c 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -1509,7 +1509,7 @@ static void ParseOption (const char* option, const char* parms)
break;
case LogIpfwDenied:
- logIpfwDenied = yesNoValue;;
+ logIpfwDenied = yesNoValue;
break;
case PidFile:
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
index e027d5287ca1..1b3538955081 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
@@ -1,4 +1,4 @@
-/*-
+/*
* Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
* Copyright (c) 2012 Damjan Marion <dmarion@freebsd.org>
* All rights reserved.
@@ -280,7 +280,7 @@ DELAY(int usec)
}
/* Get the number of times to count */
- counts = usec * ((bcm_systimer_tc.tc_frequency / 1000000) + 1);;
+ counts = usec * ((bcm_systimer_tc.tc_frequency / 1000000) + 1);
first = bcm_systimer_tc_read_4(SYSTIMER_CLO);
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index c2d01393787b..d3473503262f 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -368,7 +368,7 @@ DELAY(int usec)
}
/* Get the number of times to count */
- counts = usec * ((am335x_dmtimer_tc.tc_frequency / 1000000) + 1);;
+ counts = usec * ((am335x_dmtimer_tc.tc_frequency / 1000000) + 1);
first = am335x_dmtimer_tc_read_4(DMTIMER_TCRR);
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 8bc1c16aaa33..a1241c2d33f5 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -480,7 +480,7 @@ ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc,
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();
}
@@ -12593,7 +12593,7 @@ ctl_process_done(union ctl_io *io, int have_lock)
*/
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) {
diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c
index 6a942653aa98..1e632cae4615 100644
--- a/sys/cam/scsi/scsi_enc_ses.c
+++ b/sys/cam/scsi/scsi_enc_ses.c
@@ -1323,7 +1323,7 @@ ses_process_config(enc_softc_t *enc, struct enc_fsm_state *state,
enc_cache = &enc->enc_daemon_cache;
ses_cache = enc_cache->private;
buf = *bufp;
- err = -1;;
+ err = -1;
if (error != 0) {
err = error;
diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c
index 4e73d02bf3a2..a0978d17b732 100644
--- a/sys/dev/ahci/ahciem.c
+++ b/sys/dev/ahci/ahciem.c
@@ -87,7 +87,7 @@ ahci_em_attach(device_t dev)
if (!(enc->r_memc = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
&rid, RF_ACTIVE)))
return (ENXIO);
- enc->capsem = ATA_INL(enc->r_memc, 0);;
+ enc->capsem = ATA_INL(enc->r_memc, 0);
rid = 1;
if (!(enc->r_memt = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
&rid, RF_ACTIVE))) {
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index b0987167f8c6..455c7235747d 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -2984,7 +2984,7 @@ cxgb_extension_ioctl(struct cdev *dev, unsigned long cmd, caddr_t data,
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;
diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c
index 8c467f1b5697..cce734695ace 100644
--- a/sys/dev/e1000/if_lem.c
+++ b/sys/dev/e1000/if_lem.c
@@ -3425,7 +3425,7 @@ lem_free_receive_structures(struct adapter *adapter)
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;
diff --git a/sys/dev/hpt27xx/os_bsd.c b/sys/dev/hpt27xx/os_bsd.c
index 43f8116ed40d..12f832bae5de 100644
--- a/sys/dev/hpt27xx/os_bsd.c
+++ b/sys/dev/hpt27xx/os_bsd.c
@@ -133,7 +133,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/isf/isf.c b/sys/dev/isf/isf.c
index b3ac080a381f..e53779912525 100644
--- a/sys/dev/isf/isf.c
+++ b/sys/dev/isf/isf.c
@@ -498,7 +498,7 @@ isf_disk_ioctl(struct disk *disk, u_long cmd, void *data, int fflag,
static void
isf_disk_strategy(struct bio *bp)
{
- struct isf_softc *sc = bp->bio_disk->d_drv1;;
+ struct isf_softc *sc = bp->bio_disk->d_drv1;
/*
* We advertise a block size and maximum I/O size up the stack; catch
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
index e02fe337128d..a76a0aaf01fa 100644
--- a/sys/dev/mps/mps_sas.c
+++ b/sys/dev/mps/mps_sas.c
@@ -2020,7 +2020,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/mps/mps_user.c b/sys/dev/mps/mps_user.c
index ee0357359d16..3183df857e44 100644
--- a/sys/dev/mps/mps_user.c
+++ b/sys/dev/mps/mps_user.c
@@ -1000,7 +1000,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/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 61a6f7d136b0..79ba41045163 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -248,7 +248,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,
oce_add_vlan, sc, EVENTHANDLER_PRI_FIRST);
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index 3fc948b6741f..0be77c3d47f2 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -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)) {
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index 07874efb460f..2e2b4efee503 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -1179,7 +1179,7 @@ static void
smsc_tick(struct usb_ether *ue)
{
struct smsc_softc *sc = uether_getsc(ue);
- struct mii_data *mii = uether_getmii(&sc->sc_ue);;
+ struct mii_data *mii = uether_getmii(&sc->sc_ue);
SMSC_LOCK_ASSERT(sc, MA_OWNED);
diff --git a/sys/fs/nandfs/nandfs_subr.c b/sys/fs/nandfs/nandfs_subr.c
index b485422caab9..961a0a81412e 100644
--- a/sys/fs/nandfs/nandfs_subr.c
+++ b/sys/fs/nandfs/nandfs_subr.c
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
#include "nandfs.h"
#include "nandfs_subr.h"
-MALLOC_DEFINE(M_NANDFSMNT, "nandfs_mount", "NANDFS mount");;
+MALLOC_DEFINE(M_NANDFSMNT, "nandfs_mount", "NANDFS mount");
MALLOC_DEFINE(M_NANDFSTEMP, "nandfs_tmt", "NANDFS tmp");
uma_zone_t nandfs_node_zone;
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index 9428b39fcf48..82d1ccefa4b7 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -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
diff --git a/sys/mips/rmi/xlr_i2c.c b/sys/mips/rmi/xlr_i2c.c
index eca41226cd80..96f982066702 100644
--- a/sys/mips/rmi/xlr_i2c.c
+++ b/sys/mips/rmi/xlr_i2c.c
@@ -332,7 +332,7 @@ retry:
continue;
if (pos >= len)
- break;;
+ break;
}
*sent = len - 1;
return 0;
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index a5746e426b27..e5c40bf364b1 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -723,7 +723,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
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;
diff --git a/sys/ofed/drivers/net/mlx4/en_netdev.c b/sys/ofed/drivers/net/mlx4/en_netdev.c
index 537e3eb4d498..3dca7563f66d 100644
--- a/sys/ofed/drivers/net/mlx4/en_netdev.c
+++ b/sys/ofed/drivers/net/mlx4/en_netdev.c
@@ -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;
diff --git a/sys/ofed/drivers/net/mlx4/en_rx.c b/sys/ofed/drivers/net/mlx4/en_rx.c
index cf85615d27ff..d6843d8cd2f6 100644
--- a/sys/ofed/drivers/net/mlx4/en_rx.c
+++ b/sys/ofed/drivers/net/mlx4/en_rx.c
@@ -405,7 +405,7 @@ static inline int invalid_cqe(struct mlx4_en_priv *priv,
}
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;
diff --git a/tools/regression/lib/libc/nss/test-gethostby.c b/tools/regression/lib/libc/nss/test-gethostby.c
index 61e4ca2af4ce..5a0c92597554 100644
--- a/tools/regression/lib/libc/nss/test-gethostby.c
+++ b/tools/regression/lib/libc/nss/test-gethostby.c
@@ -565,7 +565,7 @@ hostent_read_snapshot_addr(char *addr, unsigned char *result, size_t len)
static int
hostent_read_snapshot_func(struct hostent *ht, char *line)
{
- StringList *sl1, *sl2;;
+ StringList *sl1, *sl2;
char *s, *ps, *ts;
int i, rv;
diff --git a/tools/regression/sockets/unix_cmsg/unix_cmsg.c b/tools/regression/sockets/unix_cmsg/unix_cmsg.c
index 6a39ac36ade5..c16b468ceb70 100644
--- a/tools/regression/sockets/unix_cmsg/unix_cmsg.c
+++ b/tools/regression/sockets/unix_cmsg/unix_cmsg.c
@@ -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)
diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c
index fa234433fc18..90beba2339d1 100644
--- a/usr.sbin/diskinfo/diskinfo.c
+++ b/usr.sbin/diskinfo/diskinfo.c
@@ -339,7 +339,7 @@ speeddisk(int fd, off_t mediasize, u_int sectorsize)
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++) {
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index 6b1d685ee3e1..dc71ab316711 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -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");
}