From nobody Thu Sep 28 15:52:26 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 4RxHzv2G49z4tyNQ; Thu, 28 Sep 2023 15:52:27 +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 4RxHzv1br5z4KJl; Thu, 28 Sep 2023 15:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695916347; 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=cdmP0TlG0MvzRQUrpMZVBPtX22woAVrMjek0jPH1Qy0=; b=HwI8FKPQoSYHu/1q4YZ44iGsE3o4NLIq6ErMC36/f1fv3wkGegvntokthIYnh8bvxyXyeJ TbuuRq6CmVi+58uhsamM/KJtiVuJM8zgqw63QSxrj0IBoHh4URQruzQozIrk4OeycEHJuX 6oyFX/+Ic86PZX0Kab9VOQKQRn7/2L41WELxc63XKfnhQ6UjAwS4InUJEwFKkCKfQVh6kr 2uRU3CMDcQiJNOy//z6GS0NUxPJhkqfXPvLIcW0PZKqRZuBfPNszsusmqXJNSRXAC/odkw KgN5KUgMK27hPh43fZB2m2qUNqu/2JyYvAavZUWBAIKScHLDMMSXJ473hHdXQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695916347; a=rsa-sha256; cv=none; b=AjKeuXPmXlfZJivRLX3utHSi4be5vNUTHSLcabsAPKhzV12cScCrcZTnS3NrGW4uBciAF3 sJaqDdHVxwyDUXVCsS7/vdVwaBspK/VY/sZjVpNvwcUoJfr4FGO4hr+mqm8p/wK8KK+6NY wqHM+bYCM4bKVt++DIAAQQ8Qk+OGH2KOGXtBJwkeT5X6KGBMPSoLnNVKtWxMRl3+xNTvtR e9kM1pU1Ms1lN2c2WEa9+jMlr5J/I9Wd9CiS1jlbc2ZIrOdHF939BgQ+XfeMq8b6BOrqpE CjQcMH898s5D+rKfQZ5mlzsGXaHHaCOWwc1/DDpbJsSJewYU38aMONCG4xY2wA== 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=1695916347; 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=cdmP0TlG0MvzRQUrpMZVBPtX22woAVrMjek0jPH1Qy0=; b=mxhYRock57Q1RmuNrbtGiwaStxiWsgdHZqG4NabIaiwkrZwdKneE3xtZyNhD3kYHG1/mIC GkWcv5QOqoULshwF7g/GXvkP5XwqA5FW9OvGxNxnaP0S2w0g0dUesbFhly5JwM2CGP1FHN vtN2YLOfae8EQZOkvkwksfDm0iBNvjYEns0Y+1ci/w3D52kAn9gdgS5xeyNYmQ2rIF3dcY Qp8cPyZsBH+xRHhM4zydQliAnR+xktoy/u5tvP9Ps45Z/vSoRnXNJP+KpoPuscItJmKfth aY68iOAz1Q770PhGEwwg0EBLOKiXtTCRRALVjIkY7E4Y5gWdRr7BRWCpEEsTSw== 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 4RxHzv0H5YzDL3; Thu, 28 Sep 2023 15:52:27 +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 38SFqQph021723; Thu, 28 Sep 2023 15:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SFqQGS021720; Thu, 28 Sep 2023 15:52:26 GMT (envelope-from git) Date: Thu, 28 Sep 2023 15:52:26 GMT Message-Id: <202309281552.38SFqQGS021720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1bb61348e69e - main - syslogd: Use boolean reload parameter for init() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bb61348e69e6facc1fbac49d82236218028eeb8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1bb61348e69e6facc1fbac49d82236218028eeb8 commit 1bb61348e69e6facc1fbac49d82236218028eeb8 Author: Jake Freeland AuthorDate: 2023-09-01 02:49:36 +0000 Commit: Mark Johnston CommitDate: 2023-09-28 15:51:52 +0000 syslogd: Use boolean reload parameter for init() Replace init()'s integer "signo" parameter with boolean "reload" for clarity. Reviewed by: markj, emaste MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41416 --- usr.sbin/syslogd/syslogd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 21e2d48b0c37..b61a10c20aca 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -434,7 +434,7 @@ static void fprintlog_first(struct filed *, const char *, const char *, const char *, const char *, const char *, const char *, int); static void fprintlog_write(struct filed *, struct iovlist *, int); static void fprintlog_successive(struct filed *, int); -static void init(int); +static void init(bool); static void logerror(const char *); static void logmsg(int, const struct logtime *, const char *, const char *, const char *, const char *, const char *, const char *, int); @@ -2493,7 +2493,7 @@ readconfigfile(const char *path) * INIT -- Initialize syslogd from configuration table */ static void -init(int signo) +init(bool reload) { int i; struct filed *f; @@ -2507,7 +2507,7 @@ init(int signo) /* * Load hostname (may have changed). */ - if (signo != 0) + if (reload) (void)strlcpy(oldLocalHostName, LocalHostName, sizeof(oldLocalHostName)); if (gethostname(LocalHostName, sizeof(LocalHostName))) @@ -2651,9 +2651,9 @@ init(int signo) NULL, NULL, "restart", 0); dprintf("syslogd: restarted\n"); /* - * Log a change in hostname, but only on a restart. + * Log a change in hostname, but only on reload. */ - if (signo != 0 && strcmp(oldLocalHostName, LocalHostName) != 0) { + if (reload && strcmp(oldLocalHostName, LocalHostName) != 0) { (void)snprintf(hostMsg, sizeof(hostMsg), "hostname changed, \"%s\" to \"%s\"", oldLocalHostName, LocalHostName); @@ -2663,9 +2663,9 @@ init(int signo) } /* * Log the kernel boot file if we aren't going to use it as - * the prefix, and if this is *not* a restart. + * the prefix, and if this is *not* a reload. */ - if (signo == 0 && !use_bootfile) { + if (!reload && !use_bootfile) { (void)snprintf(bootfileMsg, sizeof(bootfileMsg), "kernel boot file is %s", bootfile); logmsg(LOG_KERN | LOG_INFO, NULL, LocalHostName, "syslogd",