From nobody Sun Apr 09 23:57:59 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 4PvpvW4L8Jz44SXM; Sun, 9 Apr 2023 23:57:59 +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 4PvpvW2GGmz4FLl; Sun, 9 Apr 2023 23:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681084679; 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=UImsTlHsW/a3aba9NocwsaPvVmyv9X5sxRjUUWsc2ZU=; b=t063mthzVF5Sv4jtXOHmKhnSxChw2KH94mqGkpkbTn8+Ze4NRRdFlLq6w3/5yklkq98S6z vyEAG5Xakqv4SL2H81pUswEbOGdoNlOoFwdFu4D9anroL6sTdPyq3EbxxBkbw2sycw1oUh sQfGhea2EKxVtVSmxlOTwrnO5rBZEv2+67Hr5kYjlOOgcI4Qhx7ptiybEgvDlsiIy7e3pB kivQpXHkX3O9ZbSsE/g1+zQzXDNaFF+ec2BV0mN2MNL1L1BbmSUD8B9FdJGusx+lNqwiOP L+67Os+zsJ93OZCe4KYMONhrMrjjkKTRw5FpXSV/+99xwnIY4U8Hz8BEqlGG5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681084679; 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=UImsTlHsW/a3aba9NocwsaPvVmyv9X5sxRjUUWsc2ZU=; b=bY3Quow8EUiFZUNebCsD/ijf5ve4LSVcf0MFwadjS2BgeQIAFcVNpOYImzt/YRVuVYe77z pJ8wF9j5YBIsbZ5xXNx8kVQHzg7TaL03TMVBa/uXmUQPKxDA5CpS9rWicHK08n4c/+WgsB 0BWVpygujGrbS+7ig623prcfnTH7R/rqf4MNk3JH9wJ18DqRSIJQvr8J7ROwC0WHgikxDt KkfhgA3rdAOlewplInhbVOEqd7HhuF6gdojQuOkND6HOfC0RJmuctSbVI1xNM0KCxoasi2 cPpBrs4+jZgmqFAHnkAqx4lqTvuutDaW7DZKV4hJEeGeS9jv8YXdxXTECX3+vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681084679; a=rsa-sha256; cv=none; b=DvY5sRFqePrGhAsjaIVl98eIqwNBpMSln3EdAVH1HUsSO+GWSghl8AANZnfw6lTYj/P2sH OXUKDa9uRz5BCR8+juY6cSvE+MzZ2kUSC4NwhZh/CiqkYI8l2TueFpJmEr396acW0j+gbu JBFyBxxd3YDC/LCXNw+hy9gOKn/kOKWy97ZFAxlzFQ/c2MfeMah9ygAdxPW9+8DiOXW/K1 lceO2wHAE3E5L0aYQYO5c1OffRzPeGlAJwYh/t52i9BO3GhbSxXaZ2IxXRpfNgqOXxsXfr x6rwU+KLTjfBsoRWuSoAHMEBLX4NUBWd3ONLMPzipUAIPeLjzdVDlaBVCgX92w== 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 4PvpvW1HhvzT2t; Sun, 9 Apr 2023 23:57:59 +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 339NvxHl011981; Sun, 9 Apr 2023 23:57:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339Nvxch011980; Sun, 9 Apr 2023 23:57:59 GMT (envelope-from git) Date: Sun, 9 Apr 2023 23:57:59 GMT Message-Id: <202304092357.339Nvxch011980@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: 2a69943c7b65 - stable/13 - daemon: kill off some stray blank lines 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: 2a69943c7b653dced1217fbfe74cd68019d19c18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2a69943c7b653dced1217fbfe74cd68019d19c18 commit 2a69943c7b653dced1217fbfe74cd68019d19c18 Author: Kyle Evans AuthorDate: 2023-03-18 06:04:35 +0000 Commit: Kyle Evans CommitDate: 2023-04-09 22:49:51 +0000 daemon: kill off some stray blank lines Overlooked in review; mea culpa. Reported by: jrtc27 (cherry picked from commit 6b49a630f441e1a9e8c8e57d2bb71e589d95872c) --- usr.sbin/daemon/daemon.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index eb69fc87a827..54e2aeea6874 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -97,7 +97,6 @@ static void daemon_sleep(time_t, long); static void daemon_state_init(struct daemon_state *); static void daemon_terminate(struct daemon_state *); - static volatile sig_atomic_t terminate = 0; static volatile sig_atomic_t child_gone = 0; static volatile sig_atomic_t pid = 0; @@ -381,7 +380,6 @@ restart: daemon_terminate(&state); } - /* fork succeeded, this is child's branch or supervision is disabled */ if (pid == 0) { pidfile_write(state.child_pidfh); @@ -755,7 +753,6 @@ daemon_state_init(struct daemon_state *state) }; } - static _Noreturn void daemon_terminate(struct daemon_state *state) {