From nobody Wed Dec 27 16:10:16 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 4T0c6w3pYhz55sjf; Wed, 27 Dec 2023 16:10:16 +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 4T0c6w3B4Zz3PY4; Wed, 27 Dec 2023 16:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703693416; 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=3vazHVQDrD91JS9AARegP43DqE3AMBMPn25K16pBlu0=; b=dzSuC73WkN/mGQRtYFwTctIFgFnuEeboHzLZky24k/eHQvOg27ShUDacyt/cuf7j8ICHy1 i/l/LbexbXJ9sf3E3LxZM3/6XgVUOZqJfmtJNaFg1AIsSOlIsYEa8QRAG2CqHkFMWOm1CN ArMpsb7cYI32Lkvhkg6sV+oOQGkAbGFqysaOd5b12VwUf0nPpRt19RKcN9qyoyn1hmLdt2 DFpnGkBToq7ZV+sqr50WPWhHxJe3xa+TOxtePa7IQ8EnHtn/TlIwSenI42tBe63lHtQza5 ZNjNFVfpxplxPDLwfDKavAICa1F8ad1sF2p7DOLGH2io9bNaljfJRpBW8bk3vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703693416; a=rsa-sha256; cv=none; b=AdLeOvfBqrEFKtK0Qn38AJjqrBXVIuxvKIC6XMTgRXiy5BlzAGsh6MVyRCsp25DLKMRz1i gmUNLOJxPkY4FOeVNWc2g6iwOFEndtS8+4SPI2euYantuhRUZVKnFwCc2vceCkQYc9GngY L9j30qYc6iExkWJiK60HQFEq5rkLxhO32WMwnkUaiC8edu9SxGv6BQVdyVGG4LhhL0heG/ 4O+Pzj7oYQ/MWMpvljOlfPTMnzMNpwomQ+lY4V/brDv6Kf58jT843/0peYTkn3rB0NCvZ6 xwCYpZEjq03QUdGIcbT9p4sADzA18L+5vTJFJbO0COrMNO5BVGFRGuxv8AK3Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703693416; 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=3vazHVQDrD91JS9AARegP43DqE3AMBMPn25K16pBlu0=; b=SdWUe5GNBg9OL0iLv0vUzJSPKw2o6mXaAQagL06zw/4ug14pJbA/avN8048L2++L9Y4Z9G CbGcRi9i+VjKFAqKU0jO0cUcmqMdPals11wJxAHaSivy/YGOIJJsPQr8GS8rOazp7Y0D3u NZJPODxD5ui15nHcvYerijWFGQ+ZyzaFUHSkqxLId/Xoz9NhEff4uufUIOBkp4A3vdtV0V CuezlsiY+pozrDQkrLrXMnkgxUndkQvsm38MGnA234mZY32Gs5FeusbUdtABawbeVUrz6M qfxxV2h5j0OXPBDV/OAfeLvI4T7L2JqaLXwJHsFRa2ROJlRwyVRG6XjIYv6ZcQ== 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 4T0c6w2DSQzlVw; Wed, 27 Dec 2023 16:10:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRGAGdS040709; Wed, 27 Dec 2023 16:10:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRGAG7c040704; Wed, 27 Dec 2023 16:10:16 GMT (envelope-from git) Date: Wed, 27 Dec 2023 16:10:16 GMT Message-Id: <202312271610.3BRGAG7c040704@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: e064557916a9 - main - daemon: fix recent style regressions 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: e064557916a905d0add20c4012cf3678131c11e7 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e064557916a905d0add20c4012cf3678131c11e7 commit e064557916a905d0add20c4012cf3678131c11e7 Author: Kyle Evans AuthorDate: 2023-12-27 16:08:28 +0000 Commit: Kyle Evans CommitDate: 2023-12-27 16:09:47 +0000 daemon: fix recent style regressions Re-wrap the read(2) line, and make the listen_child loop more explicit in intent. Reported by: kib Fixes: 6ac7c9f06ae9 ("daemon: remove redundant parameter from [...]") --- usr.sbin/daemon/daemon.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index f349a382edd2..6cde194cf16e 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -455,7 +455,9 @@ daemon_eventloop(struct daemon_state *state) /* child is dead, read all until EOF */ state->pid = -1; state->mode = MODE_NOCHILD; - while (listen_child(state)); + while (listen_child(state)) { + continue; + } } continue; case SIGTERM: @@ -597,7 +599,8 @@ listen_child(struct daemon_state *state) assert(state != NULL); assert(state->pos < LBUF_SIZE - 1); - rv = read(state->pipe_rd, state->buf + state->pos, LBUF_SIZE - state->pos - 1); + rv = read(state->pipe_rd, state->buf + state->pos, + LBUF_SIZE - state->pos - 1); if (rv > 0) { state->pos += rv; assert(state->pos <= LBUF_SIZE - 1);