git: b32bf19a506b - stable/13 - sys/cddl: remove extraneous semicolons
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 08 Feb 2022 20:05:15 UTC
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=b32bf19a506bb37d1b003cf9dfa0a31418cb1704
commit b32bf19a506bb37d1b003cf9dfa0a31418cb1704
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-08-16 14:29:44 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-02-08 20:04:31 +0000
sys/cddl: remove extraneous semicolons
Fixes: 5a1b490d502e ("FreeBSD changes to vendor source.")
Fixes: 91eaf3e1831d ("Custom DTrace kernel module...")
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
(cherry picked from commit b1a217a369186dc45c7df7bde13a87868fd5b2c8)
---
sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 2 +-
sys/cddl/dev/fbt/fbt.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index dfdd2834d4cc..ca2a5438f1f1 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -14836,7 +14836,7 @@ static int
dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which)
{
dtrace_optval_t *opt = state->dts_options, size;
- processorid_t cpu = 0;;
+ processorid_t cpu = 0;
int flags = 0, rval, factor, divisor = 1;
ASSERT(MUTEX_HELD(&dtrace_lock));
diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c
index 3bad4243c040..2137075e3831 100644
--- a/sys/cddl/dev/fbt/fbt.c
+++ b/sys/cddl/dev/fbt/fbt.c
@@ -367,7 +367,7 @@ fbt_resume(void *arg, dtrace_id_t id, void *parg)
static int
fbt_ctfoff_init(modctl_t *lf, linker_ctf_t *lc)
{
- const Elf_Sym *symp = lc->symtab;;
+ const Elf_Sym *symp = lc->symtab;
const ctf_header_t *hp = (const ctf_header_t *) lc->ctftab;
const uint8_t *ctfdata = lc->ctftab + sizeof(ctf_header_t);
int i;
@@ -799,7 +799,7 @@ fbt_array_info(linker_ctf_t *lc, ctf_id_t type, ctf_arinfo_t *arp)
static const char *
ctf_strptr(linker_ctf_t *lc, int name)
{
- const ctf_header_t *hp = (const ctf_header_t *) lc->ctftab;;
+ const ctf_header_t *hp = (const ctf_header_t *) lc->ctftab;
const char *strp = "";
if (name < 0 || name >= hp->cth_strlen)