From nobody Thu Mar 2 03:01:05 2023 X-Original-To: dev-commits-src-all@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 4PRwpp0y26z3vk12; Thu, 2 Mar 2023 03:01:06 +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 4PRwpn57Vjz44SB; Thu, 2 Mar 2023 03:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726065; 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=J+wyrd5V6OK328q06/19tePCGBT8f2bJ9+uIUdB3/sI=; b=AoTA6pz+DxQ3mSmYt376wP8lHLMEAUVOS1Snbq52RRqIB7QeQvhlSOhuUA0aVZRZSEcqSI YY8jWoLDoKBrcmqTReZvSHp04MoSwr+O1MBS2Hl1rBJmyvC0JpZPfJq98ViLdZJ5iP5Q6x FQn0QDrGRu2f+X6S2xvg1AWnu2eOftHDHWInbwQDBeQItc4M03pOBur7FAtQoc4x75+7Vy j4TNfBQBXDKNV773SniOcBRoCSfkTqN4XxlaptqJDZjgfJ3AVMf+RotwFl4ivdfw6P66rr kb4iCdMU98cv4BgwAiWFIJGWFsueHzdMElHbGWOnyiwWp4JbwG9OFFcF/VaG9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677726065; 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=J+wyrd5V6OK328q06/19tePCGBT8f2bJ9+uIUdB3/sI=; b=W7UXqXNFciGEL6LgtC5JPEh1LlF7x7/iGfFTGlG4IqGEHpL7L5a+crj2eXeNPxUSrTz6fz x1ekMNOPpDllHK7H3cZr4mZHaYQO5rHDvdSg1JlQb2PMzV7C0Cwk3yPFmGM3Q3Nuucc+C6 evwHxV2JOpJ+ztsZ3RyrHidsA1h6OkkYZ6eUOGMNdbG2eTBuWqwVCzCjOvGczsmRRJRnNp PB02xs48AbEZp44yw1uZGcgLAt5+WtrE2MTShkS4BdE2VknH94B84cz0UMNpO/iaqtVsbv f/qm9+PN2oaz+hVub0kZH0w+l0OHkItDhTYa0PfRf6aj7EyFQQKAPCmETDjmCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677726065; a=rsa-sha256; cv=none; b=BKCz5cqzL3MG3n2A3ucxYvGr3ouwDzzOcdaWwylGp3TpJeB14npCDQXdPPyONKSEOuAuGY 5/og3KFVVCLu+KlnZxtUDyY+lvg6InZ8TW6AfA+ygabl8W73mOwpVVQ6lo4dGvyIEFWrQF RZsTCzo/GlApe528AsIrKSaxD8M0CfpLsB5iVdpFEUMvjigtaHPrlibp91VbtPJDavKtV4 N/30jbI08YkifyLu1GKqNS5ZHRX6KQfmvkh2lt2C6tLlziNbtfR/No3VfRdW7nELfpdYTa C2pdDK2VwYCnz9cGMdSR9hqRWT04Ce31PHtE9pFBAUgCAIQGLpVAPI7G/GvvGw== 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 4PRwpn4D7gzyxm; Thu, 2 Mar 2023 03:01:05 +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 322315vT034230; Thu, 2 Mar 2023 03:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322315cn034229; Thu, 2 Mar 2023 03:01:05 GMT (envelope-from git) Date: Thu, 2 Mar 2023 03:01:05 GMT Message-Id: <202303020301.322315cn034229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: f2f9d31d9f9f - main - daemon: make dosyslog variable a bool and give it a better name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2f9d31d9f9f7f319edb95874b41af0733a26624 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f2f9d31d9f9f7f319edb95874b41af0733a26624 commit f2f9d31d9f9f7f319edb95874b41af0733a26624 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-02 03:00:42 +0000 daemon: make dosyslog variable a bool and give it a better name Following style(9) and C99 recommendation use bool instead of int for boolean operations. Also give the variable a more descriptive name that follows boolean naming convention. Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/669 --- usr.sbin/daemon/daemon.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index f15a3f567a8c..344b914d464b 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -60,11 +60,11 @@ __FBSDID("$FreeBSD$"); #define LBUF_SIZE 4096 struct log_params { - int dosyslog; int logpri; int noclose; int outfd; const char *outfn; + bool syslog_enabled; }; static void restrict_process(const char *); @@ -143,6 +143,7 @@ int main(int argc, char *argv[]) { bool supervision_enabled = false; + bool syslog_enabled = false; char *p = NULL; const char *pidfile = NULL; const char *logtag = "daemon"; @@ -152,7 +153,6 @@ main(int argc, char *argv[]) const char *user = NULL; int ch = 0; int child_eof = 0; - int dosyslog = 0; int log_reopen = 0; int logfac = LOG_DAEMON; int logpri = LOG_NOTICE; @@ -191,7 +191,7 @@ main(int argc, char *argv[]) if (logfac == -1) { errx(5, "unrecognized syslog facility"); } - dosyslog = 1; + syslog_enabled = true; break; case 'm': stdmask = strtol(optarg, &p, 10); @@ -222,17 +222,17 @@ main(int argc, char *argv[]) if (logpri == -1) { errx(4, "unrecognized syslog priority"); } - dosyslog = 1; + syslog_enabled = true; break; case 'S': - dosyslog = 1; + syslog_enabled = true; break; case 't': title = optarg; break; case 'T': logtag = optarg; - dosyslog = 1; + syslog_enabled = true; break; case 'u': user = optarg; @@ -262,7 +262,7 @@ main(int argc, char *argv[]) } } - if (dosyslog) { + if (syslog_enabled) { openlog(logtag, LOG_PID | LOG_NDELAY, logfac); } @@ -299,7 +299,7 @@ main(int argc, char *argv[]) ppidfile != NULL || restart != 0 || outfd != -1 || - dosyslog != 0; + syslog_enabled == true; if (supervision_enabled) { struct sigaction act_term = { 0 }; @@ -349,7 +349,7 @@ main(int argc, char *argv[]) */ (void)madvise(NULL, 0, MADV_PROTECT); logpar.outfd = outfd; - logpar.dosyslog = dosyslog; + logpar.syslog_enabled = syslog_enabled; logpar.logpri = logpri; logpar.noclose = noclose; logpar.outfn = outfn; @@ -487,7 +487,7 @@ exit: close(outfd); close(pfd[0]); close(pfd[1]); - if (dosyslog) { + if (syslog_enabled) { closelog(); } pidfile_remove(pfh); @@ -647,14 +647,14 @@ do_output(const unsigned char *buf, size_t len, struct log_params *logpar) if (len < 1) { return; } - if (logpar->dosyslog) { + if (logpar->syslog_enabled) { syslog(logpar->logpri, "%.*s", (int)len, buf); } if (logpar->outfd != -1) { if (write(logpar->outfd, buf, len) == -1) warn("write"); } - if (logpar->noclose && !logpar->dosyslog && logpar->outfd == -1) { + if (logpar->noclose && !logpar->syslog_enabled && logpar->outfd == -1) { printf("%.*s", (int)len, buf); } }