From nobody Tue Feb 08 20:05:15 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 67CC519C0774; Tue, 8 Feb 2022 20:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtYs83Mykz3GDZ; Tue, 8 Feb 2022 20:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644350717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFW5I7gXj0kLjGDXsoa6k2RrwkJBw2X39OyWNiW1vVo=; b=sgHcA/f2K0BHJI7fHMgZUnNA5qSThKU66nPMRponl4B7hQ20F3Mk+TixLsTH6WP/ekhehd 18Rz9i5t+FLV9byIA6qmY8zdq4Wgy+o0nxeVG5kP7OTNSNUw0mioNCZ+CqHXBlNqvxjo7K UBwshoIsVV6dbbFk1F/xp40YGq8fOkQDH2Z50ZZJe0cr1YG9ayy1CA6krp+4cCCEA+BsT/ +O1b8LlY6ZQwV7cSuVnKSbbzU/bsEKlmXgMlxoWo1qzQLTgb9s2INqEysNsfH476xYXhHd ktakhwBYRjGolTHlnzEXEfvp1qHh4UW+k/1mFw5NC5iAKqVtOzxVzz4gcqqJvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06A251F370; Tue, 8 Feb 2022 20:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 218K5F2B010102; Tue, 8 Feb 2022 20:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218K5Fmg010101; Tue, 8 Feb 2022 20:05:15 GMT (envelope-from git) Date: Tue, 8 Feb 2022 20:05:15 GMT Message-Id: <202202082005.218K5Fmg010101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b32bf19a506b - stable/13 - sys/cddl: remove extraneous semicolons List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b32bf19a506bb37d1b003cf9dfa0a31418cb1704 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644350717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFW5I7gXj0kLjGDXsoa6k2RrwkJBw2X39OyWNiW1vVo=; b=XqkWSpMC4MikrVs7JbED+MhA1qbmCqp7kKNtF43zsh/NRANKxoAdLAWEEkTYN7+mFoeTqG T3+4RQX2eaXdiOQ+zHF1Ly/I9jsodUjE9ug/tCXFAqtgimOARIkzjQIxRAYGVmMN90Lbnr a9VurrNfm0P4lZu1x9wTkjS/aPNLwnzde+O30xyrl66Mrytl3/OHh1oKjw7fMJhB22zf9h hPL1tGxXbSo2HjkN8Cd1cE8bFFowtMKSovle7hPsvZrFKITJWexNEUrXOI6VKg0NsW5g7r NNCdd4IU5RjPNnxipLXJtLkeotOU7ZYnLW577MYSMsXD9mQ8wWodjRUmZqIb7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644350717; a=rsa-sha256; cv=none; b=jMyIxc/n9AachMpsyN+V0OYaBF8QBb59P2EzBvNlgjNqaklLvkEddJhqBdbt+Jyzxv2XeY XPZQTe09VjCdQUaos0ca+RW9fqRJ53vU21MeiFAvShlZgrpEEFSMvlD0t6We/gRn+65rxg yWXe3IV7zBrLNp2eBg5zlq+9twfEcuqBRCW1nD1xr5HgIlYRhyw3cCF6kU3R32q6Yi9Hxk yqVnsBBfEcbWLaisoreqUrzxM4ycTstFJ0LEquje2sTXcdu6pOGIMxhbhiy8x20vHrBoxW qlO+/+VYwaJJ/X3/dpctJYv7/c02X+lhtolO1aeilQaE7IPVbJz6oDBjusvDdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b32bf19a506bb37d1b003cf9dfa0a31418cb1704 commit b32bf19a506bb37d1b003cf9dfa0a31418cb1704 Author: Ed Maste AuthorDate: 2021-08-16 14:29:44 +0000 Commit: Ed Maste 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)