From nobody Thu Jun 18 20:14:25 2026 X-Original-To: dev-commits-src-main@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 4ghBlW1gvMz6gdZF for ; Thu, 18 Jun 2026 20:14:31 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ghBlV6frfz3tcX for ; Thu, 18 Jun 2026 20:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781813670; 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=MOIHW1Xyy87thK3TKRfA52+SZVttc1QITmjsZU8TEUw=; b=Q0Q0czwDHtfAxDfFettQw6rGHooHN1VrAmSrwQGVNOX/2VzJ7X9Ag5Y8BN7j5a99wDRdEw avqCVcymW/qLktzvAT9VDaV4dFt/SFIGq2dwlRODHVYdLgLzq7ZZIn7u8ovtXtAQszdHgj g42dR6NbFmWTZ5gB1h/S8GzUoKIfeQrt5l8qzTj5FEUwJx5vn3JJvWKGWE9lQv4jymlcsG 06nsPUpjLbBuD1/LygvqiC+G9AStwAnucf/759XmtD8J6danpWapXEFVUPtCt4/6Djv4yb WIt+mctYfiHSrfxluCb9p+UG3LsR3GAa7htTf5LTI/lh6qqC85/d5tsi1hnliA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781813670; a=rsa-sha256; cv=none; b=bGeWp7FSa0OmdB1y1pcZMAsXAGRh0cuXNTQKDRhUn/o1/9YuG1x51n3fAs/Y+hbxNlUCei UlPQA+ejaTTVxa/UUN2aymowtnHeQVOvprrXyX7L5YHR0O8u388zihaKXx5hcQurbhA+yF XLQbZpFCk1HuTZ+t9m7iwerVIKC7h9lmTOvDbq8RD/McGg3RZYv6oiB16tDIKCShTYfLz6 /Js+I06xd2wRmIKqnJ94VDWIRjCQifVY3ovXm/CkE+3cETfbY77DVitKMNoGE0bYF107z0 25OCFAKYAJHwXr/myaFRD9mNZ/B6tkuxp907/DEPM5c4oalvWC6wF6Fnrrsmhw== 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=1781813670; 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=MOIHW1Xyy87thK3TKRfA52+SZVttc1QITmjsZU8TEUw=; b=MSc8FgrJUON9t2K3x7eedLLv+5R/9tUTX2R9t1FQe0mjB+KZmLFv7SePw/HVjMPPWozcoV zK5NoDQijRAH3DCtyqugG/2bRhoUEgUm490aC3XJebli2OevJVmWXJIJEyVZop+d5EAU5f /NYPJfbFd6tCBhWQLk7zXezJ8oDKgSqJhLq7CtEUcO2itC4bypH5RGtJYbrI2tFuTYELiF VvCXPV7Rori4TGTT8gHuwv7tsGneKiqhsouXicQUqVZf7oYs8c4zQFs77SH612YVBTAGUm MoFqHc+RgwTpwPQhVLO3UU5zXIrxekzrqQO048Z8Y/kKXy/Mmeb5E9J9dhIywg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ghBlP5fYsz1CXZ for ; Thu, 18 Jun 2026 20:14:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39586 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Jun 2026 20:14:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 943bfad1097f - main - autofs: remove dead code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 943bfad1097f3459f70ece6ecfd86e5d6d615a6e Auto-Submitted: auto-generated Date: Thu, 18 Jun 2026 20:14:25 +0000 Message-Id: <6a3451a1.39586.4fc74e93@gitrepo.freebsd.org> The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=943bfad1097f3459f70ece6ecfd86e5d6d615a6e commit 943bfad1097f3459f70ece6ecfd86e5d6d615a6e Author: Robert Wing AuthorDate: 2026-06-18 20:12:46 +0000 Commit: Robert Wing 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); } }