Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 28 Sep 2023 15:52:41 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 09080d8ec52b - main - syslogd: Fix sizeof() styling
Message-ID:  <202309281552.38SFqfDr022315@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=09080d8ec52bb37ccb1c6bd99fe6360b68225092

commit 09080d8ec52bb37ccb1c6bd99fe6360b68225092
Author:     Jake Freeland <jfree@FreeBSD.org>
AuthorDate: 2023-09-01 02:50:55 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-09-28 15:51:53 +0000

    syslogd: Fix sizeof() styling
    
    Use parentheses when applying sizeof() per style(9).
    
    Reviewed by:    markj, emaste
    MFC after:      3 weeks
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D41376
---
 usr.sbin/syslogd/syslogd.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 5965eb2b0252..659b71385087 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -809,7 +809,7 @@ main(int argc, char *argv[])
 		setlinebuf(stdout);
 
 	consfile.f_type = F_CONSOLE;
-	(void)strlcpy(consfile.fu_fname, ctty + sizeof _PATH_DEV - 1,
+	(void)strlcpy(consfile.fu_fname, ctty + sizeof(_PATH_DEV) - 1,
 	    sizeof(consfile.fu_fname));
 	(void)strlcpy(bootfile, getbootfile(), sizeof(bootfile));
 
@@ -2923,7 +2923,7 @@ parse_selector(const char *p, struct filed *f)
 		pri = decode(buf, prioritynames);
 		if (pri < 0) {
 			errno = 0;
-			(void)snprintf(ebuf, sizeof ebuf,
+			(void)snprintf(ebuf, sizeof(ebuf),
 			    "unknown priority name \"%s\"", buf);
 			logerror(ebuf);
 			free(f);
@@ -2950,7 +2950,7 @@ parse_selector(const char *p, struct filed *f)
 			i = decode(buf, facilitynames);
 			if (i < 0) {
 				errno = 0;
-				(void)snprintf(ebuf, sizeof ebuf,
+				(void)snprintf(ebuf, sizeof(ebuf),
 				    "unknown facility name \"%s\"",
 				    buf);
 				logerror(ebuf);
@@ -3461,11 +3461,11 @@ allowaddr(char *s __unused)
 			printf("numeric, ");
 			getnameinfo(sstosa(&ap->a_addr),
 				    (sstosa(&ap->a_addr))->sa_len,
-				    ip, sizeof ip, NULL, 0, NI_NUMERICHOST);
+				    ip, sizeof(ip), NULL, 0, NI_NUMERICHOST);
 			printf("addr = %s, ", ip);
 			getnameinfo(sstosa(&ap->a_mask),
 				    (sstosa(&ap->a_mask))->sa_len,
-				    ip, sizeof ip, NULL, 0, NI_NUMERICHOST);
+				    ip, sizeof(ip), NULL, 0, NI_NUMERICHOST);
 			printf("mask = %s; ", ip);
 		} else {
 			printf("domainname = %s; ", ap->a_name);
@@ -3513,8 +3513,8 @@ validate(struct sockaddr *sa, const char *hname)
 	if (getaddrinfo(name, NULL, &hints, &res) == 0)
 		freeaddrinfo(res);
 	else if (strchr(name, '.') == NULL) {
-		strlcat(name, ".", sizeof name);
-		strlcat(name, LocalDomain, sizeof name);
+		strlcat(name, ".", sizeof(name));
+		strlcat(name, LocalDomain, sizeof(name));
 	}
 	if (getnameinfo(sa, sa->sa_len, ip, sizeof(ip), port, sizeof(port),
 			NI_NUMERICHOST | NI_NUMERICSERV) != 0)
@@ -3648,7 +3648,7 @@ p_open(const char *prog, int *rpd)
 	 */
 	if (fcntl(pfd[1], F_SETFL, O_NONBLOCK) == -1) {
 		/* This is bad. */
-		(void)snprintf(errmsg, sizeof errmsg,
+		(void)snprintf(errmsg, sizeof(errmsg),
 			       "Warning: cannot change pipe to PID %d to "
 			       "non-blocking behaviour.",
 			       (int)pid);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309281552.38SFqfDr022315>