Module Name: src
Committed By: msaitoh
Date: Thu May 14 08:34:20 UTC 2020
Modified Files:
src/bin/sh: eval.c parser.c
src/common/lib/libc/gen: radixtree.c
src/crypto/dist/ipsec-tools/src/racoon: ipsec_doi.c
src/crypto/external/bsd/netpgp/dist/src/libverify: libverify.c
src/games/snake/snake: snake.c
src/lib/libcrypt: crypt-argon2.c pw_gensalt.c
src/sbin/fsck_lfs: segwrite.c
src/sbin/gpt: restore.c
src/sbin/ifconfig: af_inet.c
src/sbin/mount_portal: pt_filter.c
src/sbin/newfs_udf: udf_create.c
src/sys/arch/arm/imx: if_enet.c imx7_usb.c
src/sys/arch/arm/marvell: armadaxp.c pci_machdep.c
src/sys/arch/arm/omap: ti_iic.c
src/sys/arch/arm/s3c2xx0: s3c2440_extint.c
src/sys/arch/arm/sunxi: sunxi_usbphy.c
src/sys/arch/arm/ti: ti_iic.c
src/sys/arch/i386/stand/lib: exec_multiboot2.c
src/sys/arch/mips/rmi: rmixl_firmware.h
src/sys/dev: md.c
src/sys/dev/pci: if_aq.c if_ixl.c mfii.c
src/sys/dev/usb: if_urtwreg.h
src/sys/stand/efiboot: efienv.c
src/tests/fs/vfs: t_rwtoro.c
src/tests/lib/libppath: t_ppath.c
src/tests/lib/libpthread: t_thrd.c
src/tests/lib/librt: t_sem.c
src/usr.sbin/bta2dpd/bta2dpd: avdtp.c
src/usr.sbin/installboot: evboards.c
Log Message:
Remove extra semicolon.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/bin/sh/eval.c
cvs rdiff -u -r1.169 -r1.170 src/bin/sh/parser.c
cvs rdiff -u -r1.26 -r1.27 src/common/lib/libc/gen/radixtree.c
cvs rdiff -u -r1.51 -r1.52 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
cvs rdiff -u -r1.29 -r1.30 src/games/snake/snake/snake.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libcrypt/crypt-argon2.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libcrypt/pw_gensalt.c
cvs rdiff -u -r1.47 -r1.48 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.18 -r1.19 src/sbin/gpt/restore.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/ifconfig/af_inet.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/mount_portal/pt_filter.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/newfs_udf/udf_create.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx7_usb.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/marvell/armadaxp.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/marvell/pci_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/ti_iic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/s3c2xx0/s3c2440_extint.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_usbphy.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/ti_iic.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/lib/exec_multiboot2.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_firmware.h
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/md.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_aq.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/if_ixl.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/mfii.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_urtwreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/efienv.c
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/vfs/t_rwtoro.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libppath/t_ppath.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libpthread/t_thrd.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/librt/t_sem.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/bta2dpd/bta2dpd/avdtp.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/installboot/evboards.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.179 src/bin/sh/eval.c:1.180
--- src/bin/sh/eval.c:1.179 Thu Apr 23 09:01:33 2020
+++ src/bin/sh/eval.c Thu May 14 08:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.179 2020/04/23 09:01:33 kre Exp $ */
+/* $NetBSD: eval.c,v 1.180 2020/05/14 08:34:17 msaitoh Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.179 2020/04/23 09:01:33 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.180 2020/05/14 08:34:17 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -1208,7 +1208,7 @@ evalcommand(union node *cmd, int flgs, s
shellparam = saveparam;
}
if (saved)
- popredir();;
+ popredir();
unreffunc(cmdentry.u.func);
poplocalvars();
localvars = savelocalvars;
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.169 src/bin/sh/parser.c:1.170
--- src/bin/sh/parser.c:1.169 Tue Dec 10 09:18:37 2019
+++ src/bin/sh/parser.c Thu May 14 08:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.169 2019/12/10 09:18:37 kre Exp $ */
+/* $NetBSD: parser.c,v 1.170 2020/05/14 08:34:17 msaitoh Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.169 2019/12/10 09:18:37 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.170 2020/05/14 08:34:17 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -2091,7 +2091,7 @@ readtoken1(int firstc, char const *syn,
parenlevel++;
VTRACE(DBG_LEXER, ("'('(%d)", parenlevel));
USTPUTC(c, out);
- continue;;
+ continue;
case CRP: /* ')' in arithmetic */
if (parenlevel > 0) {
USTPUTC(c, out);
Index: src/common/lib/libc/gen/radixtree.c
diff -u src/common/lib/libc/gen/radixtree.c:1.26 src/common/lib/libc/gen/radixtree.c:1.27
--- src/common/lib/libc/gen/radixtree.c:1.26 Sat Apr 11 01:46:47 2020
+++ src/common/lib/libc/gen/radixtree.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: radixtree.c,v 1.26 2020/04/11 01:46:47 ad Exp $ */
+/* $NetBSD: radixtree.c,v 1.27 2020/05/14 08:34:19 msaitoh Exp $ */
/*-
* Copyright (c)2011,2012,2013 YAMAMOTO Takashi,
@@ -112,7 +112,7 @@
#include <sys/cdefs.h>
#if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.26 2020/04/11 01:46:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radixtree.c,v 1.27 2020/05/14 08:34:19 msaitoh Exp $");
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/pool.h>
@@ -122,7 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: radixtree.c,
#include <lib/libsa/stand.h>
#endif /* defined(_STANDALONE) */
#else /* defined(_KERNEL) || defined(_STANDALONE) */
-__RCSID("$NetBSD: radixtree.c,v 1.26 2020/04/11 01:46:47 ad Exp $");
+__RCSID("$NetBSD: radixtree.c,v 1.27 2020/05/14 08:34:19 msaitoh Exp $");
#include <assert.h>
#include <errno.h>
#include <stdbool.h>
@@ -1339,13 +1339,13 @@ test1(void)
assert(!radix_tree_get_tag(t, 0, 2));
assert(radix_tree_get_tag(t, 1000, 2));
assert(!radix_tree_get_tag(t, UINT64_C(10000000000), 1));
- radix_tree_set_tag(t, 0, 2);;
+ radix_tree_set_tag(t, 0, 2);
radix_tree_set_tag(t, UINT64_C(10000000000), 2);
radix_tree_dump(t);
assert(radix_tree_get_tag(t, 0, 2));
assert(radix_tree_get_tag(t, 1000, 2));
assert(radix_tree_get_tag(t, UINT64_C(10000000000), 2));
- radix_tree_clear_tag(t, 0, 2);;
+ radix_tree_clear_tag(t, 0, 2);
radix_tree_clear_tag(t, UINT64_C(10000000000), 2);
radix_tree_dump(t);
assert(!radix_tree_get_tag(t, 0, 2));
Index: src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.51 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.52
--- src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.51 Sat May 19 20:14:56 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_doi.c,v 1.51 2018/05/19 20:14:56 maxv Exp $ */
+/* $NetBSD: ipsec_doi.c,v 1.52 2020/05/14 08:34:19 msaitoh Exp $ */
/* Id: ipsec_doi.c,v 1.55 2006/08/17 09:20:41 vanhu Exp */
@@ -984,7 +984,7 @@ get_ph2approval(iph2, pair)
continue;
plog(LLV_DEBUG, LOCATION, NULL,
"pair[%d]: %p\n", i, pair[i]);
- print_proppair(LLV_DEBUG, pair[i]);;
+ print_proppair(LLV_DEBUG, pair[i]);
/* compare proposal and select one */
ret = get_ph2approvalx(iph2, pair[i]);
Index: src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.9 src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c:1.9 Tue Mar 4 17:29:06 2014
+++ src/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c Thu May 14 08:34:19 2020
@@ -207,7 +207,7 @@ static uint8_t *
get_ref(pgpv_ref_t *ref)
{
pgpv_mem_t *mem;
- pgpv_t *pgp = (pgpv_t *)ref->vp;;
+ pgpv_t *pgp = (pgpv_t *)ref->vp;
mem = &ARRAY_ELEMENT(pgp->areas, ref->mem);
return &mem->mem[ref->offset];
Index: src/games/snake/snake/snake.c
diff -u src/games/snake/snake/snake.c:1.29 src/games/snake/snake/snake.c:1.30
--- src/games/snake/snake/snake.c:1.29 Mon Jun 27 08:46:04 2016
+++ src/games/snake/snake/snake.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: snake.c,v 1.29 2016/06/27 08:46:04 dholland Exp $ */
+/* $NetBSD: snake.c,v 1.30 2020/05/14 08:34:18 msaitoh Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)snake.c 8.2 (Berkeley) 1/7/94";
#else
-__RCSID("$NetBSD: snake.c,v 1.29 2016/06/27 08:46:04 dholland Exp $");
+__RCSID("$NetBSD: snake.c,v 1.30 2020/05/14 08:34:18 msaitoh Exp $");
#endif
#endif /* not lint */
@@ -192,7 +192,7 @@ main(int argc, char **argv)
penalty = loot = 0;
if (!initscr())
- errx(0, "couldn't initialize screen");;
+ errx(0, "couldn't initialize screen");
cbreak();
noecho();
#ifdef KEY_LEFT
Index: src/lib/libcrypt/crypt-argon2.c
diff -u src/lib/libcrypt/crypt-argon2.c:1.1 src/lib/libcrypt/crypt-argon2.c:1.2
--- src/lib/libcrypt/crypt-argon2.c:1.1 Mon Oct 21 02:36:48 2019
+++ src/lib/libcrypt/crypt-argon2.c Thu May 14 08:34:19 2020
@@ -63,7 +63,7 @@ getnum(const char *str, size_t *num)
static int decode_option(argon2_context * ctx, argon2_type * atype, const char * option)
{
size_t tmp=0;
- char * in = 0,*inp;;
+ char * in = 0,*inp;
char * a=0;
char * p=0;
size_t sl;
Index: src/lib/libcrypt/pw_gensalt.c
diff -u src/lib/libcrypt/pw_gensalt.c:1.8 src/lib/libcrypt/pw_gensalt.c:1.9
--- src/lib/libcrypt/pw_gensalt.c:1.8 Mon Oct 21 02:36:48 2019
+++ src/lib/libcrypt/pw_gensalt.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pw_gensalt.c,v 1.8 2019/10/21 02:36:48 jhigh Exp $ */
+/* $NetBSD: pw_gensalt.c,v 1.9 2020/05/14 08:34:19 msaitoh Exp $ */
/*
* Copyright 1997 Niels Provos <[email protected]>
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pw_gensalt.c,v 1.8 2019/10/21 02:36:48 jhigh Exp $");
+__RCSID("$NetBSD: pw_gensalt.c,v 1.9 2020/05/14 08:34:19 msaitoh Exp $");
#endif /* not lint */
#include <sys/syslimits.h>
@@ -189,7 +189,7 @@ __gensalt_sha1(char *salt, size_t saltsi
static int __gensalt_argon2_decode_option(char * dst, size_t dlen, const char * option)
{
- char * in = 0;;
+ char * in = 0;
char * a = 0;
size_t tmp = 0;
int error = 0;
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.47 src/sbin/fsck_lfs/segwrite.c:1.48
--- src/sbin/fsck_lfs/segwrite.c:1.47 Fri Apr 3 19:36:33 2020
+++ src/sbin/fsck_lfs/segwrite.c Thu May 14 08:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.47 2020/04/03 19:36:33 joerg Exp $ */
+/* $NetBSD: segwrite.c,v 1.48 2020/05/14 08:34:17 msaitoh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -405,7 +405,7 @@ lfs_gatherblock(struct segment * sp, str
bn = lfs_fi_getnblocks(fs, sp->fip);
lfs_fi_setnblocks(fs, sp->fip, bn + 1);
- lfs_fi_setblock(fs, sp->fip, bn, bp->b_lblkno + j);;
+ lfs_fi_setblock(fs, sp->fip, bn, bp->b_lblkno + j);
}
sp->sum_bytes_left -= LFS_BLKPTRSIZE(fs) * blksinblk;
Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.18 src/sbin/gpt/restore.c:1.19
--- src/sbin/gpt/restore.c:1.18 Tue Jul 3 03:41:24 2018
+++ src/sbin/gpt/restore.c Thu May 14 08:34:17 2020
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: restore.c,v 1.18 2018/07/03 03:41:24 jnemeth Exp $");
+__RCSID("$NetBSD: restore.c,v 1.19 2020/05/14 08:34:17 msaitoh Exp $");
#endif
#include <sys/types.h>
@@ -210,7 +210,7 @@ restore(gpt_t gpt, const char *infile, i
prop_string_t propstr;
unsigned int entries;
const char *s;
- void *secbuf = NULL;;
+ void *secbuf = NULL;
int rv = -1;
last = gpt->mediasz / gpt->secsz - 1LL;
Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.27 src/sbin/ifconfig/af_inet.c:1.28
--- src/sbin/ifconfig/af_inet.c:1.27 Fri Apr 10 14:32:50 2020
+++ src/sbin/ifconfig/af_inet.c Thu May 14 08:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inet.c,v 1.27 2020/04/10 14:32:50 plunky Exp $ */
+/* $NetBSD: af_inet.c,v 1.28 2020/05/14 08:34:17 msaitoh Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.27 2020/04/10 14:32:50 plunky Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.28 2020/05/14 08:34:17 msaitoh Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -64,7 +64,7 @@ static void in_status(prop_dictionary_t,
static void in_commit_address(prop_dictionary_t, prop_dictionary_t);
static bool in_addr_tentative(struct ifaddrs *);
static bool in_addr_tentative_or_detached(struct ifaddrs *);
-static in_addr_t in_netmask(struct sockaddr *);;
+static in_addr_t in_netmask(struct sockaddr *);
static int in_prefixlen(struct sockaddr *);
static void in_alias(struct ifaddrs *, prop_dictionary_t, prop_dictionary_t);
Index: src/sbin/mount_portal/pt_filter.c
diff -u src/sbin/mount_portal/pt_filter.c:1.11 src/sbin/mount_portal/pt_filter.c:1.12
--- src/sbin/mount_portal/pt_filter.c:1.11 Tue Jan 4 23:36:23 2011
+++ src/sbin/mount_portal/pt_filter.c Thu May 14 08:34:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pt_filter.c,v 1.11 2011/01/04 23:36:23 wiz Exp $ */
+/* $NetBSD: pt_filter.c,v 1.12 2020/05/14 08:34:17 msaitoh Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pt_filter.c,v 1.11 2011/01/04 23:36:23 wiz Exp $");
+__RCSID("$NetBSD: pt_filter.c,v 1.12 2020/05/14 08:34:17 msaitoh Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -61,7 +61,7 @@ fill_cmd(char **cmdv, char *path, char *
{
int i;
/* Make tempbuff at least as large as buff. */
- char *tempbuff = malloc(n);;
+ char *tempbuff = malloc(n);
if (tempbuff == NULL)
err(1, NULL);
Index: src/sbin/newfs_udf/udf_create.c
diff -u src/sbin/newfs_udf/udf_create.c:1.27 src/sbin/newfs_udf/udf_create.c:1.28
--- src/sbin/newfs_udf/udf_create.c:1.27 Sun Apr 5 15:25:40 2020
+++ src/sbin/newfs_udf/udf_create.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.27 2020/04/05 15:25:40 joerg Exp $ */
+/* $NetBSD: udf_create.c,v 1.28 2020/05/14 08:34:18 msaitoh Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf_create.c,v 1.27 2020/04/05 15:25:40 joerg Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.28 2020/05/14 08:34:18 msaitoh Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -342,7 +342,7 @@ udf_calculate_disc_layout(int format_fla
if (format_flags & FORMAT_META) {
/* note: all in backing partition space */
layout.meta_file = pos++;
- layout.meta_bitmap = pos++;;
+ layout.meta_bitmap = pos++;
layout.meta_mirror = layout.part_size_lba-1;
layout.meta_alignment = MAX(blockingnr, sparable_blockingnr);
layout.meta_blockingnr = MAX(layout.meta_alignment, 32);
Index: src/sys/arch/arm/imx/if_enet.c
diff -u src/sys/arch/arm/imx/if_enet.c:1.31 src/sys/arch/arm/imx/if_enet.c:1.32
--- src/sys/arch/arm/imx/if_enet.c:1.31 Wed Jan 29 06:05:31 2020
+++ src/sys/arch/arm/imx/if_enet.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet.c,v 1.31 2020/01/29 06:05:31 thorpej Exp $ */
+/* $NetBSD: if_enet.c,v 1.32 2020/05/14 08:34:19 msaitoh Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.31 2020/01/29 06:05:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.32 2020/05/14 08:34:19 msaitoh Exp $");
#include "vlan.h"
@@ -1136,7 +1136,7 @@ enet_miibus_statchg(struct ifnet *ifp)
if ((ife->ifm_media & IFM_FDX) != 0) {
tcr |= ENET_TCR_FDEN; /* full duplex */
- rcr &= ~ENET_RCR_DRT;; /* enable receive on transmit */
+ rcr &= ~ENET_RCR_DRT; /* enable receive on transmit */
} else {
tcr &= ~ENET_TCR_FDEN; /* half duplex */
rcr |= ENET_RCR_DRT; /* disable receive on transmit */
Index: src/sys/arch/arm/imx/imx7_usb.c
diff -u src/sys/arch/arm/imx/imx7_usb.c:1.4 src/sys/arch/arm/imx/imx7_usb.c:1.5
--- src/sys/arch/arm/imx/imx7_usb.c:1.4 Wed Jul 24 11:20:55 2019
+++ src/sys/arch/arm/imx/imx7_usb.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_usb.c,v 1.4 2019/07/24 11:20:55 hkenken Exp $ */
+/* $NetBSD: imx7_usb.c,v 1.5 2020/05/14 08:34:19 msaitoh Exp $ */
/*
* Copyright (c) 2013 Genetec Corporation. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_usb.c,v 1.4 2019/07/24 11:20:55 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_usb.c,v 1.5 2020/05/14 08:34:19 msaitoh Exp $");
#include "locators.h"
@@ -92,7 +92,7 @@ imx7_usbc_search(device_t parent, cfdata
sc = device_private(parent);
aa.aa_iot = sc->sc_iot;
aa.aa_ioh = sc->sc_ioh;
- aa.aa_dmat = &arm_generic_dma_tag;;
+ aa.aa_dmat = &arm_generic_dma_tag;
aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT];
aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ];
Index: src/sys/arch/arm/marvell/armadaxp.c
diff -u src/sys/arch/arm/marvell/armadaxp.c:1.21 src/sys/arch/arm/marvell/armadaxp.c:1.22
--- src/sys/arch/arm/marvell/armadaxp.c:1.21 Sun Feb 26 09:33:27 2017
+++ src/sys/arch/arm/marvell/armadaxp.c Thu May 14 08:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp.c,v 1.21 2017/02/26 09:33:27 skrll Exp $ */
+/* $NetBSD: armadaxp.c,v 1.22 2020/05/14 08:34:20 msaitoh Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
*******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp.c,v 1.21 2017/02/26 09:33:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp.c,v 1.22 2020/05/14 08:34:20 msaitoh Exp $");
#define _INTR_PRIVATE
@@ -1056,7 +1056,7 @@ armadaxp_sdcache_wb_range(vaddr_t va, pa
void
armadaxp_sdcache_wbinv_range(vaddr_t va, paddr_t pa, psize_t sz)
{
- paddr_t pa_base = pa & ~ARMADAXP_L2_ALIGN;;
+ paddr_t pa_base = pa & ~ARMADAXP_L2_ALIGN;
paddr_t pa_end = (pa + sz - 1) & ~ARMADAXP_L2_ALIGN;
if (pa_base == pa_end)
Index: src/sys/arch/arm/marvell/pci_machdep.c
diff -u src/sys/arch/arm/marvell/pci_machdep.c:1.15 src/sys/arch/arm/marvell/pci_machdep.c:1.16
--- src/sys/arch/arm/marvell/pci_machdep.c:1.15 Mon Nov 26 11:53:58 2018
+++ src/sys/arch/arm/marvell/pci_machdep.c Thu May 14 08:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.15 2018/11/26 11:53:58 jmcneill Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.16 2020/05/14 08:34:20 msaitoh Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.15 2018/11/26 11:53:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.16 2020/05/14 08:34:20 msaitoh Exp $");
#include "opt_mvsoc.h"
#include "gtpci.h"
@@ -446,7 +446,7 @@ mvpex_mbus_conf_read(void *v, pcitag_t t
*/
struct mvsoc_softc *soc =
- device_private(device_parent(sc->sc_dev));;
+ device_private(device_parent(sc->sc_dev));
bus_space_handle_t pcicfg_ioh;
uint32_t remapl, remaph, wc, pcicfg_addr, pcicfg_size;
int window, target, attr, base, size, s;
Index: src/sys/arch/arm/omap/ti_iic.c
diff -u src/sys/arch/arm/omap/ti_iic.c:1.11 src/sys/arch/arm/omap/ti_iic.c:1.12
--- src/sys/arch/arm/omap/ti_iic.c:1.11 Sun Dec 22 23:23:29 2019
+++ src/sys/arch/arm/omap/ti_iic.c Thu May 14 08:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_iic.c,v 1.11 2019/12/22 23:23:29 thorpej Exp $ */
+/* $NetBSD: ti_iic.c,v 1.12 2020/05/14 08:34:20 msaitoh Exp $ */
/*
* Copyright (c) 2013 Manuel Bouyer. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.11 2019/12/22 23:23:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.12 2020/05/14 08:34:20 msaitoh Exp $");
#include "opt_omap.h"
#include "locators.h"
@@ -458,7 +458,7 @@ ti_iic_op(struct ti_iic_softc *sc, i2c_a
con = I2C_CON_EN;
con |= I2C_CON_MST;
- con |= I2C_CON_STT;;
+ con |= I2C_CON_STT;
if (flags & I2C_F_STOP)
con |= I2C_CON_STP;
if (addr & ~0x7f)
Index: src/sys/arch/arm/s3c2xx0/s3c2440_extint.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2440_extint.c:1.2 src/sys/arch/arm/s3c2xx0/s3c2440_extint.c:1.3
--- src/sys/arch/arm/s3c2xx0/s3c2440_extint.c:1.2 Sat Oct 27 17:17:40 2012
+++ src/sys/arch/arm/s3c2xx0/s3c2440_extint.c Thu May 14 08:34:20 2020
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2440_extint.c,v 1.2 2012/10/27 17:17:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2440_extint.c,v 1.3 2020/05/14 08:34:20 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -285,7 +285,7 @@ ssextio_cascaded_intr(void *cookie)
}
- save = disable_interrupts(I32_bit);;
+ save = disable_interrupts(I32_bit);
pending = pending_mask & bus_space_read_4(iot, ioh, GPIO_EINTPEND);
pending &= ~ssextio_softc->sc_mask;
ssextio_softc->sc_pending |= pending;
Index: src/sys/arch/arm/sunxi/sunxi_usbphy.c
diff -u src/sys/arch/arm/sunxi/sunxi_usbphy.c:1.11 src/sys/arch/arm/sunxi/sunxi_usbphy.c:1.12
--- src/sys/arch/arm/sunxi/sunxi_usbphy.c:1.11 Mon Feb 19 20:15:23 2018
+++ src/sys/arch/arm/sunxi/sunxi_usbphy.c Thu May 14 08:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_usbphy.c,v 1.11 2018/02/19 20:15:23 jmcneill Exp $ */
+/* $NetBSD: sunxi_usbphy.c,v 1.12 2020/05/14 08:34:20 msaitoh Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_usbphy.c,v 1.11 2018/02/19 20:15:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_usbphy.c,v 1.12 2020/05/14 08:34:20 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -138,7 +138,7 @@ sunxi_usbphy_write(struct sunxi_usbphy_s
struct sunxi_usbphy *phy, u_int bit_addr, u_int bits,
u_int len)
{
- const uint32_t usbc_mask = __BIT(phy->phy_index * 2);;
+ const uint32_t usbc_mask = __BIT(phy->phy_index * 2);
bus_size_t reg;
uint32_t val;
Index: src/sys/arch/arm/ti/ti_iic.c
diff -u src/sys/arch/arm/ti/ti_iic.c:1.4 src/sys/arch/arm/ti/ti_iic.c:1.5
--- src/sys/arch/arm/ti/ti_iic.c:1.4 Fri Nov 1 09:49:21 2019
+++ src/sys/arch/arm/ti/ti_iic.c Thu May 14 08:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_iic.c,v 1.4 2019/11/01 09:49:21 jmcneill Exp $ */
+/* $NetBSD: ti_iic.c,v 1.5 2020/05/14 08:34:20 msaitoh Exp $ */
/*
* Copyright (c) 2013 Manuel Bouyer. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.4 2019/11/01 09:49:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.5 2020/05/14 08:34:20 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -479,7 +479,7 @@ ti_iic_op(struct ti_iic_softc *sc, i2c_a
con = I2C_CON_EN;
con |= I2C_CON_MST;
- con |= I2C_CON_STT;;
+ con |= I2C_CON_STT;
if (flags & I2C_F_STOP)
con |= I2C_CON_STP;
if (addr & ~0x7f)
Index: src/sys/arch/i386/stand/lib/exec_multiboot2.c
diff -u src/sys/arch/i386/stand/lib/exec_multiboot2.c:1.3 src/sys/arch/i386/stand/lib/exec_multiboot2.c:1.4
--- src/sys/arch/i386/stand/lib/exec_multiboot2.c:1.3 Fri Oct 18 01:15:54 2019
+++ src/sys/arch/i386/stand/lib/exec_multiboot2.c Thu May 14 08:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_multiboot2.c,v 1.3 2019/10/18 01:15:54 manu Exp $ */
+/* $NetBSD: exec_multiboot2.c,v 1.4 2020/05/14 08:34:20 msaitoh Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -863,7 +863,7 @@ mbi_apm(struct multiboot_package *mbp, v
mbt->cseg = 0;
mbt->offset = 0;
mbt->cseg_16 = 0;
- mbt->dseg = 0;;
+ mbt->dseg = 0;
mbt->flags = 0;
mbt->cseg_len = 0;
mbt->cseg_16_len = 0;
Index: src/sys/arch/mips/rmi/rmixl_firmware.h
diff -u src/sys/arch/mips/rmi/rmixl_firmware.h:1.3 src/sys/arch/mips/rmi/rmixl_firmware.h:1.4
--- src/sys/arch/mips/rmi/rmixl_firmware.h:1.3 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_firmware.h Thu May 14 08:34:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_firmware.h,v 1.3 2011/02/20 07:48:37 matt Exp $ */
+/* $NetBSD: rmixl_firmware.h,v 1.4 2020/05/14 08:34:20 msaitoh Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -167,7 +167,7 @@ typedef struct rmixlfw_cpu_wakeup_info {
int argc;
uint32_t argv[XLR_MAX_ARGV]; /* pointers ... */
char argv_buf[XLR_ARGV_BUF_SIZE]; /* ... storage */
- int valid_tlb_entries;;
+ int valid_tlb_entries;
struct lib_cpu_tlb_mapping tlb_map[MAX_TLB_MAPPINGS];
struct core_segment_info seg_info[MAX_ELF_SEGMENTS];
int envc;
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.84 src/sys/dev/md.c:1.85
--- src/sys/dev/md.c:1.84 Mon Apr 13 08:05:02 2020
+++ src/sys/dev/md.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.84 2020/04/13 08:05:02 maxv Exp $ */
+/* $NetBSD: md.c,v 1.85 2020/05/14 08:34:18 msaitoh Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.84 2020/04/13 08:05:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.85 2020/05/14 08:34:18 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -572,7 +572,7 @@ md_set_disklabel(struct md_softc *sc)
dg->dg_secsize = lp->d_secsize;
dg->dg_secperunit = lp->d_secperunit;
dg->dg_nsectors = lp->d_nsectors;
- dg->dg_ntracks = lp->d_ntracks = 64;;
+ dg->dg_ntracks = lp->d_ntracks = 64;
dg->dg_ncylinders = lp->d_ncylinders;
disk_set_info(sc->sc_dev, &sc->sc_dkdev, NULL);
Index: src/sys/dev/pci/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.16 src/sys/dev/pci/if_aq.c:1.17
--- src/sys/dev/pci/if_aq.c:1.16 Fri Apr 24 04:55:40 2020
+++ src/sys/dev/pci/if_aq.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aq.c,v 1.16 2020/04/24 04:55:40 ryo Exp $ */
+/* $NetBSD: if_aq.c,v 1.17 2020/05/14 08:34:18 msaitoh Exp $ */
/**
* aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.16 2020/04/24 04:55:40 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.17 2020/05/14 08:34:18 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_aq.h"
@@ -940,7 +940,7 @@ struct aq_softc {
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
bus_size_t sc_iosize;
- bus_dma_tag_t sc_dmat;;
+ bus_dma_tag_t sc_dmat;
void *sc_ihs[AQ_NINTR_MAX];
pci_intr_handle_t *sc_intrs;
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.65 src/sys/dev/pci/if_ixl.c:1.66
--- src/sys/dev/pci/if_ixl.c:1.65 Thu Mar 19 03:11:23 2020
+++ src/sys/dev/pci/if_ixl.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.65 2020/03/19 03:11:23 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.66 2020/05/14 08:34:18 msaitoh Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.65 2020/03/19 03:11:23 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.66 2020/05/14 08:34:18 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -895,7 +895,7 @@ static int ixl_vlan_cb(struct ethercom *
static int ixl_setup_vlan_hwfilter(struct ixl_softc *);
static void ixl_teardown_vlan_hwfilter(struct ixl_softc *);
static int ixl_update_macvlan(struct ixl_softc *);
-static int ixl_setup_interrupts(struct ixl_softc *);;
+static int ixl_setup_interrupts(struct ixl_softc *);
static void ixl_teardown_interrupts(struct ixl_softc *);
static int ixl_setup_stats(struct ixl_softc *);
static void ixl_teardown_stats(struct ixl_softc *);
Index: src/sys/dev/pci/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.6 src/sys/dev/pci/mfii.c:1.7
--- src/sys/dev/pci/mfii.c:1.6 Wed Nov 27 19:21:36 2019
+++ src/sys/dev/pci/mfii.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.6 2019/11/27 19:21:36 maxv Exp $ */
+/* $NetBSD: mfii.c,v 1.7 2020/05/14 08:34:18 msaitoh Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.6 2019/11/27 19:21:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.7 2020/05/14 08:34:18 msaitoh Exp $");
#include "bio.h"
@@ -1028,7 +1028,7 @@ mfii_shutdown(device_t dev, int how)
struct mfii_softc *sc = device_private(dev);
struct mfii_ccb *ccb;
union mfi_mbox mbox;
- bool rv = true;;
+ bool rv = true;
memset(&mbox, 0, sizeof(mbox));
Index: src/sys/dev/usb/if_urtwreg.h
diff -u src/sys/dev/usb/if_urtwreg.h:1.5 src/sys/dev/usb/if_urtwreg.h:1.6
--- src/sys/dev/usb/if_urtwreg.h:1.5 Sun Mar 15 23:04:51 2020
+++ src/sys/dev/usb/if_urtwreg.h Thu May 14 08:34:18 2020
@@ -374,7 +374,7 @@ struct urtw_softc {
#define URTW_DATA_TIMEOUT 10000 /* 10 sec */
struct urtw_rx_data sc_rx_data[URTW_RX_DATA_LIST_COUNT];
struct urtw_tx_data sc_tx_data[URTW_PRIORITY_MAX][URTW_TX_DATA_LIST_COUNT];
- uint32_t sc_tx_queued[URTW_PRIORITY_MAX];;
+ uint32_t sc_tx_queued[URTW_PRIORITY_MAX];
uint32_t sc_txidx[URTW_PRIORITY_MAX];
uint8_t sc_rts_retry;
uint8_t sc_tx_retry;
Index: src/sys/stand/efiboot/efienv.c
diff -u src/sys/stand/efiboot/efienv.c:1.4 src/sys/stand/efiboot/efienv.c:1.5
--- src/sys/stand/efiboot/efienv.c:1.4 Sun Apr 21 22:30:41 2019
+++ src/sys/stand/efiboot/efienv.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: efienv.c,v 1.4 2019/04/21 22:30:41 thorpej Exp $ */
+/* $NetBSD: efienv.c,v 1.5 2020/05/14 08:34:18 msaitoh Exp $ */
/*-
* Copyright (c) 2019 Jason R. Thorpe
@@ -82,8 +82,8 @@ efi_env_from_efibootplist(void)
continue;
}
/* XXX __UNCONST because gnuefi */
- env_key = prop_dictionary_keysym_cstring_nocopy(key);;
- env_value = __UNCONST(prop_string_cstring_nocopy(value));;
+ env_key = prop_dictionary_keysym_cstring_nocopy(key);
+ env_value = __UNCONST(prop_string_cstring_nocopy(value));
#ifdef EFIBOOT_DEBUG
printf(">> efiboot.plist env: '%s' = '%s'\n", env_key,
env_value);
Index: src/tests/fs/vfs/t_rwtoro.c
diff -u src/tests/fs/vfs/t_rwtoro.c:1.1 src/tests/fs/vfs/t_rwtoro.c:1.2
--- src/tests/fs/vfs/t_rwtoro.c:1.1 Fri Jan 27 10:45:11 2017
+++ src/tests/fs/vfs/t_rwtoro.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_rwtoro.c,v 1.1 2017/01/27 10:45:11 hannken Exp $ */
+/* $NetBSD: t_rwtoro.c,v 1.2 2020/05/14 08:34:18 msaitoh Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -135,7 +135,7 @@ basic_test(const atf_tc_t *tc, const cha
if (use_layer) {
RL(rump_sys_mkdir(null_mount, 0777));
memset(&nargs, 0, sizeof(nargs));
- nargs.nulla_target = __UNCONST(mp);;
+ nargs.nulla_target = __UNCONST(mp);
RL(rump_sys_mount(MOUNT_NULL, null_mount, 0,
&nargs, sizeof(nargs)));
}
Index: src/tests/lib/libppath/t_ppath.c
diff -u src/tests/lib/libppath/t_ppath.c:1.1 src/tests/lib/libppath/t_ppath.c:1.2
--- src/tests/lib/libppath/t_ppath.c:1.1 Thu Aug 25 19:09:46 2011
+++ src/tests/lib/libppath/t_ppath.c Thu May 14 08:34:18 2020
@@ -1,9 +1,9 @@
-/* $Id: t_ppath.c,v 1.1 2011/08/25 19:09:46 dyoung Exp $ */
+/* $Id: t_ppath.c,v 1.2 2020/05/14 08:34:18 msaitoh Exp $ */
/* Copyright (c) 2010 David Young. All rights reserved. */
#include <sys/cdefs.h>
-__RCSID("$Id: t_ppath.c,v 1.1 2011/08/25 19:09:46 dyoung Exp $");
+__RCSID("$Id: t_ppath.c,v 1.2 2020/05/14 08:34:18 msaitoh Exp $");
#include <assert.h>
#include <atf-c.h>
@@ -1483,7 +1483,7 @@ ATF_TC_HEAD(get_string_success, tc)
ATF_TC_BODY(get_string_success, tc)
{
int rc;
- const char *v = NULL;;
+ const char *v = NULL;
prop_dictionary_t d;
ppath_t *p;
Index: src/tests/lib/libpthread/t_thrd.c
diff -u src/tests/lib/libpthread/t_thrd.c:1.1 src/tests/lib/libpthread/t_thrd.c:1.2
--- src/tests/lib/libpthread/t_thrd.c:1.1 Wed Apr 24 11:43:19 2019
+++ src/tests/lib/libpthread/t_thrd.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_thrd.c,v 1.1 2019/04/24 11:43:19 kamil Exp $ */
+/* $NetBSD: t_thrd.c,v 1.2 2020/05/14 08:34:19 msaitoh Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2019\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_thrd.c,v 1.1 2019/04/24 11:43:19 kamil Exp $");
+__RCSID("$NetBSD: t_thrd.c,v 1.2 2020/05/14 08:34:19 msaitoh Exp $");
#include <signal.h>
#include <stdbool.h>
@@ -231,7 +231,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, thrd_detach);
ATF_TP_ADD_TC(tp, thrd_exit);
ATF_TP_ADD_TC(tp, thrd_sleep);
- ATF_TP_ADD_TC(tp, thrd_yield);;
+ ATF_TP_ADD_TC(tp, thrd_yield);
return atf_no_error();
}
Index: src/tests/lib/librt/t_sem.c
diff -u src/tests/lib/librt/t_sem.c:1.4 src/tests/lib/librt/t_sem.c:1.5
--- src/tests/lib/librt/t_sem.c:1.4 Sun Feb 3 03:20:24 2019
+++ src/tests/lib/librt/t_sem.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sem.c,v 1.4 2019/02/03 03:20:24 thorpej Exp $ */
+/* $NetBSD: t_sem.c,v 1.5 2020/05/14 08:34:19 msaitoh Exp $ */
/*
* Copyright (c) 2008, 2010, 2019 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008, 2010, 2019\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sem.c,v 1.4 2019/02/03 03:20:24 thorpej Exp $");
+__RCSID("$NetBSD: t_sem.c,v 1.5 2020/05/14 08:34:19 msaitoh Exp $");
#include <sys/mman.h>
#include <sys/wait.h>
@@ -211,7 +211,7 @@ put_shared_region(struct shared_region *
ATF_TC_BODY(pshared, tc)
{
- struct shared_region *master_region, *slave_region;;
+ struct shared_region *master_region, *slave_region;
if (sysconf(_SC_SEMAPHORES) == -1)
atf_tc_skip("POSIX semaphores not supported");
Index: src/usr.sbin/bta2dpd/bta2dpd/avdtp.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/avdtp.c:1.3 src/usr.sbin/bta2dpd/bta2dpd/avdtp.c:1.4
--- src/usr.sbin/bta2dpd/bta2dpd/avdtp.c:1.3 Mon Aug 5 13:39:18 2019
+++ src/usr.sbin/bta2dpd/bta2dpd/avdtp.c Thu May 14 08:34:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: avdtp.c,v 1.3 2019/08/05 13:39:18 maya Exp $ */
+/* $NetBSD: avdtp.c,v 1.4 2020/05/14 08:34:19 msaitoh Exp $ */
/*-
* Copyright (c) 2015 - 2016 Nathanial Sloss <[email protected]>
@@ -165,7 +165,7 @@ avdtpSendAccept(int fd, int recvfd, uint
uint8_t data[2];
data[0] = (uint8_t)(trans << 4 | RESPONSEACCEPT);
- data[1] = myCommand;;
+ data[1] = myCommand;
write(fd, data, sizeof(data));
Index: src/usr.sbin/installboot/evboards.c
diff -u src/usr.sbin/installboot/evboards.c:1.3 src/usr.sbin/installboot/evboards.c:1.4
--- src/usr.sbin/installboot/evboards.c:1.3 Thu Sep 19 01:25:29 2019
+++ src/usr.sbin/installboot/evboards.c Thu May 14 08:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: evboards.c,v 1.3 2019/09/19 01:25:29 thorpej Exp $ */
+/* $NetBSD: evboards.c,v 1.4 2020/05/14 08:34:18 msaitoh Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: evboards.c,v 1.3 2019/09/19 01:25:29 thorpej Exp $");
+__RCSID("$NetBSD: evboards.c,v 1.4 2020/05/14 08:34:18 msaitoh Exp $");
#endif /* !__lint */
#include <sys/types.h>
@@ -481,7 +481,7 @@ evb_uboot_pkg_paths(ib_params *params, i
char *buf = NULL;
const char *pathspec;
int i, count;
- char *cp, *startcp;;
+ char *cp, *startcp;
pathspec = getenv(UBOOT_PATHS_ENV_VAR);
if (pathspec == NULL)
@@ -1430,7 +1430,7 @@ evb_board_get_uboot_install(ib_params *p
int n = snprintf(install_key, sizeof(install_key), "%s-%s",
board_u_boot_install_key, params->media);
if (n < 0 || (size_t)n >= sizeof(install_key))
- goto invalid_media;;
+ goto invalid_media;
install = prop_dictionary_get(board, install_key);
if (install != NULL) {
if (prop_object_type(install) == PROP_TYPE_STRING) {
