From nobody Fri Mar 17 21:01:29 2023 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 4Pdc4V0G2Wz3yqvy; Fri, 17 Mar 2023 21:01:30 +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 4Pdc4T6qdVz3pvZ; Fri, 17 Mar 2023 21:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679086890; 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=aNNwxT0DVQ0JEIZ6fUmr8RkRo3rCMkgTZo0NY5Fks4w=; b=Kzohgl6qSM/c9IsM5MAAUuyTS72ziMBqaSwUw0m2FfCKhSR6+3AEFw3uf5+iLxLYfqBxSb 40fgahpkgH5qJCDpHzFNeJavbfaWFUAACHwQc+tqqHeIzC5+mZ5a+LI8S9BR7uuibgKOVB 5a+4xWmNhNN+m79BRH8AcHHxFT7E3iqAu+iM3JAVEvCop0MJhDfZhDrL9y/+QRZkgvnP7K 0zYs9bWVtfnpc1rhSpj3EqnJzjprE5KdK69flB1ITmuTnVVoo52jaq8GJOjIjgZwnc9l3t FSLqCajZiycgbU4JWq/uHBtJkVV/Tp7tOQPamvbNc0oST9SzQu1C4IylpQu0AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679086890; 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=aNNwxT0DVQ0JEIZ6fUmr8RkRo3rCMkgTZo0NY5Fks4w=; b=CiC2sG3yzxN92eG7rJp3lRmZA+AEmVETFA7dbE8oGrMpkxidUeFcrkl6nFQad9Ypz8uiJP /lW5+8KHi1FL7+A7S7GB8g4XBSsUutO/thUJcxeGJWkUuLUG3SACNwOk7NvbwsCgo4L3eW OUt2NdLhWxFfYcTNgLm0vDA9itVix1Lgk5MKEBhnAj52nTdMKwaZh2r3ig7WmzUQtWLJLx ZmPzIhdLVlJ1UpF/M5zhhkSoc31cT1SKDOtLjyg+ic8EfQJS8IQF9gTanyrRPRL48dn7N6 /2GEMxm1TGNIF/x4VqYoYqFKyp5hkNVE+qkR6EMr98KyolkvnY3o+zVHE8FlNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679086890; a=rsa-sha256; cv=none; b=RwK0ixOu2/xU3D5GMounpNRttA2/MvFMQo35XE26MTRQJYp4JwWeKu8biTXfndRdVOzlhx z0Gt3QFVkwtWjmtrB9+6kIGwm0NWu/dHLw3Q7kfI+hsUi3Kn/4VxC2h3YIPYpIXL1LH/EA B7TeYwhXqKsbnie3NSXR8ztPDKFRSi7HIv+M7qGAvu1bwepwW2ODKTyjudDJ9e03LwnkMA 8/BA6aCCVxXDtw0TomsU1lBN796M5c3gThld5Q7/Gxkl0+aCK2nts71p9QGsHesNoyBXji dxeKMEdrKmxDwVZiy2IQVo3md95RmkfqWWO4zEpE9XtzyCk8s/PC5p2XLF3uhA== 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 4Pdc4T5x8gzgcp; Fri, 17 Mar 2023 21:01:29 +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 32HL1TaC015080; Fri, 17 Mar 2023 21:01:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32HL1T7m015079; Fri, 17 Mar 2023 21:01:29 GMT (envelope-from git) Date: Fri, 17 Mar 2023 21:01:29 GMT Message-Id: <202303172101.32HL1T7m015079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d394c80f4950 - stable/13 - daemon: make dosyslog variable a bool and give it a better name 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d394c80f4950b1aeb4161582dcafaae57d7e5893 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d394c80f4950b1aeb4161582dcafaae57d7e5893 commit d394c80f4950b1aeb4161582dcafaae57d7e5893 Author: Ihor Antonov AuthorDate: 2023-03-02 03:00:42 +0000 Commit: Kyle Evans CommitDate: 2023-03-17 21:01:01 +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 (cherry picked from commit f2f9d31d9f9f7f319edb95874b41af0733a26624) --- 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); } }