From nobody Wed Sep 17 21:38:05 2025 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 4cRsZP4mQQz686x9; Wed, 17 Sep 2025 21:38:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRsZP4Fjrz3Rw1; Wed, 17 Sep 2025 21:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758145085; 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=Lxwp+/Qd375hf3RQCIiyE/dSzR9UBnGX4fHz8gGhGw4=; b=xSUcfgRu0zO7T3OVBPifoAK3ElEVVWvbLGAiKn+dIka9joeg5RZWzqr9ZNT5yiI2qAlNKQ PV+o3fqQppVMRSOE2HIiTaiLfUrWje0S0R02JNqBH4hCpKae/+rLDNtKms5WUcvZ/A56sp t2ccpKwf3f8tjrWOcJz8/7baFc8gXu/VHlyMINpy9dylCzsAlz6v9hws6ao2eKvvHU8jZo QeVEB1HnfZoUFsRx+OL+tIJoGdu5b6zFG63FBpQ6HW/RFKhYsmIZlpWOdcDpz3g+qdMsmT 3YvguDVmXS+qRceQvoXiekas2ZJEWPsm78jkNE75xh3FQcshlurVluVy/KJNdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758145085; 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=Lxwp+/Qd375hf3RQCIiyE/dSzR9UBnGX4fHz8gGhGw4=; b=sI2n3DeMAbmMt8h8HQZnBO+IUTvOcxRREH02iFgVkyVxMLoA7cQ0PLTKh/+LtvKiKcGsi9 Sx3toukRsdLuzdhrDnsCaCnnmoILlf5X1NXeEVY8H+m3SgVe32r1qDSuUY0zLC8K/y7v+1 lVqbJ+pOmNK7itlMEEIiZxx4w6ixgnf8n8OsOPUzsWlHV7bBS5t3eaJnd2Bbtubdem+Stq sg1OJkz8/RowHIj1PVqROwQLb/v8SMbD4J9pONXw8oDix8SjJZb9TgpJhWFIC61MoUcie8 ZRSwMekJsYIFB8Klz3z5TNi9/q69tcUgxM7YM4qqxPtQB4IVU+SOJDIaV46ZXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758145085; a=rsa-sha256; cv=none; b=bF3CC0guclaw/nnc7T5ngGGR/0HljJkGij+WzDE7QzaAazsEw9TVhp5Lmqvv7D5/8x3+0y g/0+Q/MGMARqsvnGuQOv8/LGyULX2lTxDQSP6n5SF1lGT2LFOXQjedCFKmQGLgpd5DkWeh T6BExPDBnZU/3cSFG0wBuQUMZk4varqbK6uSML2Bcb1+nVaDyeziLxSqgHkkRDQ9/V+cXx Z06YKP5RZYBDmGRm+9W/yNqNPTxGMqphvPcNmA5qC4swRbQje9LeOXJ3447f1PSPFuR2JS OyJabucxMmHlJ3ikCLTJ870MaKs5Dkj851xM2hM0Wrzac4lY8O4Z551FjBlRBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRsZP3YhTzk6W; Wed, 17 Sep 2025 21:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HLc5Bv042811; Wed, 17 Sep 2025 21:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HLc5VS042808; Wed, 17 Sep 2025 21:38:05 GMT (envelope-from git) Date: Wed, 17 Sep 2025 21:38:05 GMT Message-Id: <202509172138.58HLc5VS042808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: cddb9806b50b - main - syslogd: Make some code more clear. 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cddb9806b50b49722140d7b30c09643376feeaed Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=cddb9806b50b49722140d7b30c09643376feeaed commit cddb9806b50b49722140d7b30c09643376feeaed Author: Bryan Drewery AuthorDate: 2025-09-17 21:23:19 +0000 Commit: Bryan Drewery CommitDate: 2025-09-17 21:28:18 +0000 syslogd: Make some code more clear. This moves some math to where it logically makes more sense for skipping over the ": " separator in the message formatted "app[PID]: MSG". No functional change. Fixes: 18bcf5a0 ("Restore local kernel "prog" filtering") Sponsored by: Dell Inc. --- usr.sbin/syslogd/syslogd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 81bbbbe66be8..e06464c0e749 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1185,13 +1185,15 @@ parsemsg_rfc3164_app_name_procid(char **msg, const char **app_name, /* Split strings from input. */ app_name_begin[app_name_length] = '\0'; - m += app_name_length + 1; + m += app_name_length; if (procid_begin != NULL) { procid_begin[procid_length] = '\0'; + /* Skip "[PID]". */ m += procid_length + 2; } - *msg = m + 1; + /* Skip separator ": ". */ + *msg = m + 2; *app_name = app_name_begin; *procid = procid_begin; return;