git: 943bfad1097f - main - autofs: remove dead code

The branch main has been updated by rew:

URL: https://cgit.FreeBSD.org/src/commit/?id=943bfad1097f3459f70ece6ecfd86e5d6d615a6e

commit 943bfad1097f3459f70ece6ecfd86e5d6d615a6e
Author:     Robert Wing <rew@FreeBSD.org>
AuthorDate: 2026-06-18 20:12:46 +0000
Commit:     Robert Wing <rew@FreeBSD.org>
CommitDate: 2026-06-18 20:12:46 +0000

    autofs: remove dead code
    
    log_set_peer_name() and log_set_peer_addr() were never used
    
    Differential Revision:  https://reviews.freebsd.org/D57164
---
 usr.sbin/autofs/common.h |  2 --
 usr.sbin/autofs/log.c    | 66 ++++--------------------------------------------
 2 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/usr.sbin/autofs/common.h b/usr.sbin/autofs/common.h
index 5bd2abf5ef78..03ca4f8f577b 100644
--- a/usr.sbin/autofs/common.h
+++ b/usr.sbin/autofs/common.h
@@ -58,8 +58,6 @@ struct defined_value {
 };
 
 void	log_init(int level);
-void	log_set_peer_name(const char *name);
-void	log_set_peer_addr(const char *addr);
 void	log_err(int, const char *, ...)
 	    __dead2 __printf0like(2, 3);
 void	log_errx(int, const char *, ...)
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c
index 02a889bffbed..dcb9ae9a1fc2 100644
--- a/usr.sbin/autofs/log.c
+++ b/usr.sbin/autofs/log.c
@@ -41,8 +41,6 @@
 #include "common.h"
 
 static int log_level = 0;
-static char *peer_name = NULL;
-static char *peer_addr = NULL;
 
 #define	MSGBUF_LEN	1024
 
@@ -54,34 +52,6 @@ log_init(int level)
 	openlog(getprogname(), LOG_NDELAY | LOG_PID, LOG_DAEMON);
 }
 
-void
-log_set_peer_name(const char *name)
-{
-
-	/*
-	 * XXX: Turn it into assertion?
-	 */
-	if (peer_name != NULL)
-		log_errx(1, "%s called twice", __func__);
-	if (peer_addr == NULL)
-		log_errx(1, "%s called before log_set_peer_addr", __func__);
-
-	peer_name = checked_strdup(name);
-}
-
-void
-log_set_peer_addr(const char *addr)
-{
-
-	/*
-	 * XXX: Turn it into assertion?
-	 */
-	if (peer_addr != NULL)
-		log_errx(1, "%s called twice", __func__);
-
-	peer_addr = checked_strdup(addr);
-}
-
 static void
 log_common(int priority, int log_errno, const char *fmt, va_list ap)
 {
@@ -105,40 +75,14 @@ log_common(int priority, int log_errno, const char *fmt, va_list ap)
 	}
 
 	if (log_errno == -1) {
-		if (peer_name != NULL) {
-			fprintf(stderr, "%s: %s (%s): %s\n", getprogname(),
-			    peer_addr, peer_name, msgbuf_strvised);
-			syslog(priority, "%s (%s): %s",
-			    peer_addr, peer_name, msgbuf_strvised);
-		} else if (peer_addr != NULL) {
-			fprintf(stderr, "%s: %s: %s\n", getprogname(),
-			    peer_addr, msgbuf_strvised);
-			syslog(priority, "%s: %s",
-			    peer_addr, msgbuf_strvised);
-		} else {
-			fprintf(stderr, "%s: %s\n", getprogname(), msgbuf_strvised);
-			syslog(priority, "%s", msgbuf_strvised);
-		}
-
+		fprintf(stderr, "%s: %s\n", getprogname(), msgbuf_strvised);
+		syslog(priority, "%s", msgbuf_strvised);
 	} else {
 		errstr = strerror(log_errno);
 
-		if (peer_name != NULL) {
-			fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(),
-			    peer_addr, peer_name, msgbuf_strvised, errstr);
-			syslog(priority, "%s (%s): %s: %s",
-			    peer_addr, peer_name, msgbuf_strvised, errstr);
-		} else if (peer_addr != NULL) {
-			fprintf(stderr, "%s: %s: %s: %s\n", getprogname(),
-			    peer_addr, msgbuf_strvised, errstr);
-			syslog(priority, "%s: %s: %s",
-			    peer_addr, msgbuf_strvised, errstr);
-		} else {
-			fprintf(stderr, "%s: %s: %s\n", getprogname(),
-			    msgbuf_strvised, errstr);
-			syslog(priority, "%s: %s",
-			    msgbuf_strvised, errstr);
-		}
+		fprintf(stderr, "%s: %s: %s\n",
+		    getprogname(), msgbuf_strvised, errstr);
+		syslog(priority, "%s: %s", msgbuf_strvised, errstr);
 	}
 }