From nobody Fri Mar 17 21:01:37 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 4Pdc4f00Dmz3yqpD; Fri, 17 Mar 2023 21:01:37 +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 4Pdc4d6FFJz3qSm; Fri, 17 Mar 2023 21:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679086897; 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=bMBE/rl556JWR3j1MolKXKDQ36Ip3zhWPivTSoJ8MGo=; b=ONvWIA610E1LuJO8JzEvsH42+oT6Nz70tSnOMqTG9/SyFq8coc+b3RTbGeAYrFGp66myV3 2OrDfEDqio2PMApzRgcuzH1ziTdCathj+0+bFLRhFG4yroKP9zHFggpRin1axLGAfhJ7Lg iNJ2StHpsja3ZBgjquVpEL/qiGodcF/xt+izqXhtTBCHQJNitD3TAdbhaNaa3u7KsaOZpd tjEdZ4/Tiu6//b71L5UOLN7ciemzZoDOz+HSS6PI1LGOT7Kyk5QQXyM4prMRN61bYrLK3I V4vVT9Uy5ki7PAVJh54SulK0DAznNgqNCVGRfTM8VkqAp68aIsVznjO+/mUv0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679086897; 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=bMBE/rl556JWR3j1MolKXKDQ36Ip3zhWPivTSoJ8MGo=; b=tMg9F0dUPlxB4Uk2Uu/PZX1WUA6+A71iXvm2c6koIXW4B4mnbtqi8Tkv776da1ybdWn64i uXewe5AoDHS8r38d9baa04ARtW0faJPsBThfB2palVFfY1NDaIjpThGwgXZgFAN5z8ynYP 3NETZRM9C+tFKrovFbX9sf63yl1D+TeNg2LKrRq8dG3kc/qdhh+psBBVBaTWxAfkryIrrC zbvs9qEDmxEebriKt0+tI2CNLZDiiiNR27MHGgcv8H0OfoGY3V9LZvO2T79v7ZMBOt1V0W tBGG7nBlv6ax34oGLd8bcAwUQBbgMAYyuRh0VcqEN1n3mX34shpq4EBkTew9/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679086897; a=rsa-sha256; cv=none; b=FD20HSja9YbHtsOZ6/zSoZPu7AkTkrb2pzQflIv++WOadrMH7l+lxb4ZVjL8Htjgrovkef E0Puze21Mi5MpUwoiIOJJUVf/yr2dph+83yJLYxnyE2KspQ9EmW0MpsFXduhi4SIzP4/8N ITw/SwbSBSVOU7+HCN89wLUfXo6J7nWiuwF80PEzThuHYtOEmMoMWe0/smmtrq4Chv3CyX tiyrEdyh01AEa1ephrGntEWTZRudtHjXtqDMw1jt/Bnd6ePLYQvb4k121VOQBz2OFPuFUx ApzbAr99oOoR+8AU/5SlQ5uNf/UfZw/zeXrgp3WIyD0ViftmEnUUMfcSdrbATQ== 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 4Pdc4d5Gc0zgk1; Fri, 17 Mar 2023 21:01:37 +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 32HL1bEb015224; Fri, 17 Mar 2023 21:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32HL1baR015223; Fri, 17 Mar 2023 21:01:37 GMT (envelope-from git) Date: Fri, 17 Mar 2023 21:01:37 GMT Message-Id: <202303172101.32HL1baR015223@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: bb2e206cae8b - stable/13 - daemon: change type of listen_child() to C99 bool 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: bb2e206cae8ba120f9d1ef78149e61ff3f003fb0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bb2e206cae8ba120f9d1ef78149e61ff3f003fb0 commit bb2e206cae8ba120f9d1ef78149e61ff3f003fb0 Author: Ihor Antonov AuthorDate: 2023-03-03 05:17:02 +0000 Commit: Kyle Evans CommitDate: 2023-03-17 21:01:02 +0000 daemon: change type of listen_child() to C99 bool Reviewed by: kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/672 (cherry picked from commit bc43a9a7157a8249a492ee3efd8589369dd94228) --- usr.sbin/daemon/daemon.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 964a77deb0f9..5c636bcd0a03 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -73,9 +73,9 @@ static void restrict_process(const char *); static void handle_term(int); static void handle_chld(int); static void handle_hup(int); -static int open_log(const char *); +static int open_log(const char *); static void reopen_log(struct log_params *); -static int listen_child(int, struct log_params *); +static bool listen_child(int, struct log_params *); static int get_log_mapping(const char *, const CODE *); static void open_pid_files(const char *, const char *, struct pidfh **, struct pidfh **); @@ -146,13 +146,13 @@ main(int argc, char *argv[]) { bool supervision_enabled = false; bool log_reopen = false; + bool child_eof = false; char *p = NULL; const char *child_pidfile = NULL; const char *parent_pidfile = NULL; const char *title = NULL; const char *user = NULL; int ch = 0; - int child_eof = 0; int keep_cur_workdir = 1; int pfd[2] = { -1, -1 }; int restart = 0; @@ -580,10 +580,10 @@ restrict_process(const char *user) * We try to collect whole lines terminated by '\n'. Otherwise we collect a * full buffer, and then output it. * - * Return value of 0 is assumed to mean EOF or error, and 1 indicates to + * Return value of false is assumed to mean EOF or error, and true indicates to * continue reading. */ -static int +static bool listen_child(int fd, struct log_params *logpar) { static unsigned char buf[LBUF_SIZE]; @@ -617,18 +617,18 @@ listen_child(int fd, struct log_params *logpar) } /* Wait until the buffer is full. */ if (bytes_read < LBUF_SIZE - 1) { - return 1; + return true; } do_output(buf, bytes_read, logpar); bytes_read = 0; - return 1; + return true; } else if (rv == -1) { /* EINTR should trigger another read. */ if (errno == EINTR) { - return 1; + return true; } else { warn("read"); - return 0; + return false; } } /* Upon EOF, we have to flush what's left of the buffer. */ @@ -636,7 +636,7 @@ listen_child(int fd, struct log_params *logpar) do_output(buf, bytes_read, logpar); bytes_read = 0; } - return 0; + return false; } /*