From nobody Thu Oct 13 12:48:28 2022 X-Original-To: dev-commits-src-main@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 4Mp8T83wn2z4ftwc; Thu, 13 Oct 2022 12:48:28 +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 4Mp8T83GQwz3CkD; Thu, 13 Oct 2022 12:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665665308; 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=B707IVfofKUvAdocn/BOheN0Vtiv+jkmrkupxS4SqL4=; b=VnCL/qb3ZsFD9CrK3TW7hL3oQEHOATILvZlsvhKcyqT9Rx6w/E/RAzFAOCr5vJ2Bxs1Nf6 NoHR9bjbP5WaQaQoFocehx6IoZsNjVSFybT7q9wdWuqms8CT0X2ZfP5Wzcyq6RhgYwu7qH 1Z+iR7C3kHFeBuKADEQMEsJ9J/ggqvP6y8ddJojEazu/XL21pc1CcFx3Vkbo1YNAjfPpoK PtsiggBadU3xr3JPDBjQSvzqQkgN6dR3k5A+6LYMlRwLLe5k6VT/c0xhN9khs/kNsPBLPz qbUp1lOOWHM/3aDldFDXfjnrf9aPeaiGo8+KSdtCoQ2Kq/Xog9wk+/AqttUNuw== 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 4Mp8T82L6GzQcd; Thu, 13 Oct 2022 12:48:28 +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 29DCmS55099021; Thu, 13 Oct 2022 12:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DCmS60099020; Thu, 13 Oct 2022 12:48:28 GMT (envelope-from git) Date: Thu, 13 Oct 2022 12:48:28 GMT Message-Id: <202210131248.29DCmS60099020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 63f6075fcfdc - main - blacklistd: Whitespace police List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 63f6075fcfdc8e080f1e52f1dc12695fbec761e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665665308; 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=B707IVfofKUvAdocn/BOheN0Vtiv+jkmrkupxS4SqL4=; b=O8cp4gynpy3NfRLRY5g+uA9p9mw2f4qXyTMpMmRcsdNmNWX/2UEzcW/GS6ottzOI8pnr50 duRsEizile4UHxQW1bGECGgZ/Rc6KrN4prL6q2js9nMwdp/XhSvXpfTr0h2sSra5DDUOOc 6n02VucAoQt50PglgNRn6QBXoDwr5BI35TM2sMQ2iRudi9tosi8JJfG2d77at3MdbkMVd6 es0jXrWgMafVdf0BZEpz2jmvXXi8k8PVmZkq4jvrgYhiK4+TO7X9FjtoAU83xj7G9Q+ABW QDQFmaLu4vOi+H4e5eFFMaU6dM8thqyLJzq5l4cTgl/pvLOHvcxo8TX9cj0CmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665665308; a=rsa-sha256; cv=none; b=J+p4lh163ndhJ59LjuyowKawznJiGhXrm1YJtfDjNaheOPDzimS8RT3bTjsWaq6BcTwexU pRURRGv9QRl5qhlXcKVPIJKRhwL3BjGVv6czndv7InjMfmsh8DaQTyQGTvBpAo/yR1scHp Et4/cJROsKTy0Gaf+qPeicKYe6KOfPEbHRs9TEI+paRU9PvvDqMFwivHgEuEMD+oefZX1X /FUMfR5pVYRm3sLsFjbTOyrA+pLz4ykH2AUxyZcAnaxOJiHpLnVDtgG6eRNZKzTzHq4mES oAIpX4JtIg9i2pSewaKfj36O0w3S4stGyf4bbZ0A/zVyUIKYC1gan8MIUDg4FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=63f6075fcfdc8e080f1e52f1dc12695fbec761e9 commit 63f6075fcfdc8e080f1e52f1dc12695fbec761e9 Author: Jose Luis Duran AuthorDate: 2022-10-12 15:25:50 +0000 Commit: Ed Maste CommitDate: 2022-10-13 12:47:56 +0000 blacklistd: Whitespace police These were missed in the previous whitespace reduction. Fixes: 631bdcf3043c ("blacklistd: whitespace cleanup") Obtained from: https://github.com/zoulasc/blocklist --- contrib/blacklist/bin/conf.c | 2 +- contrib/blacklist/lib/bl.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/blacklist/bin/conf.c b/contrib/blacklist/bin/conf.c index 94baa75c09b0..f872b3de787a 100644 --- a/contrib/blacklist/bin/conf.c +++ b/contrib/blacklist/bin/conf.c @@ -371,6 +371,7 @@ getname(const char *f, size_t l, bool local, struct conf *c, strlcpy(c->c_name, rulename, CONFNAMESZ); return 0; } + if (strcmp(p, "=") == 0) { if (local) goto out; @@ -473,7 +474,6 @@ conf_amask_eq(const void *v1, const void *v2, size_t len, int mask) return 1; goto out; case FEQUAL: - (*lfun)(LOG_CRIT, "%s: Internal error: bad mask %d", __func__, mask); abort(); diff --git a/contrib/blacklist/lib/bl.c b/contrib/blacklist/lib/bl.c index a3aa4ef1f9f6..409317bc3fc0 100644 --- a/contrib/blacklist/lib/bl.c +++ b/contrib/blacklist/lib/bl.c @@ -501,7 +501,6 @@ bl_recv(bl_t b) (got & GOT_CRED) == 0 ? "cred" : #endif "", (got & GOT_FD) == 0 ? "fd" : ""); - return NULL; }