From nobody Tue Sep 01 14:17:06 2026 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 4hZ7Gb3sT1z6qwv1 for ; Tue, 01 Sep 2026 14:17:11 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hZ7Gb1Mycz3vNf for ; Tue, 01 Sep 2026 14:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788272231; 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=Pv0zsq3H/ngVE8m7jH/HzrijrxKssRQ1fF4B/Zpug/k=; b=SJMMb3RCMM4PGuXLlI8NgrADC8ZhVuCU9WjKu1h7eUKbUSOuzEA5nEy/xicZZazb8BcFhl 2xHlQVoofBiSXbZhy8UyuhyS2Y4Q3TgnoHdFuvSF/w3NZNW6Sah6vC2LBf4ARVwKcOW+s4 Ci+xMCUbCZqJZ2LrvOBoTd1+wJ933xJv5JcAEL0Cha5DLQLFubYAGlFt/TYWscfgDI9GpA UX4kSlwfsjVT2YEOzehe8wpKSm2HmtJFZMT77/R/eSl8Q29vkszxFo69Iflf1NR2TMRI5/ 44Ws4B02jX1pWM05RvZc6l6+MiFZJo/QFgvhYcKLJctqkytEXObHZ5Y9W0FsyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788272231; a=rsa-sha256; cv=none; b=Pp30iRcQw1opWkIu7PoLSm2lQuJk/T1M3DRn1JMlEKC+nEOomAGmphm3ai0McyjyFtRWE5 Ra4bmWFBenSBTSsr8+uHjlp/d6GTJR4BkFBQHhY73OXr01H21b6ljFZBTwwUF47ZoI8rgO Eu4nzVr+WpPX1gbZJ/eWQ1xatbgLES5N0MbSGWVbX1crqsBHQvMWgmoxhlvllxLLrciihB I3DWGMkFPcNV24pMZJSOkdVIek/0JpRYga5XShgogeMXud83awBwesc94B/dJlrnUHk7E3 V+eoxSAds/rJmpZkJCFx+YGT8rZJuIo1hIvgfCEFTrfxFDyJRczl6RM+aRUwAA== 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=1788272231; 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=Pv0zsq3H/ngVE8m7jH/HzrijrxKssRQ1fF4B/Zpug/k=; b=XvXWoWVifoKqaojMv8aevKPGyreg0dON9KMp9PduORjiQVxwH5fd2S96rmeVGz4HSJtZ7I fY5KM8B5i+gkVY2CreIWVFUlrS2XIgZIrlgsL8/HD6LuWg3aYYclKaO6pOPq59keFefDO4 iRmBumRqV9GtwYgwVDA1UXIMOE0EWcDbBP//LSBlLOFepi/Z1kcepvgkBsaVK6FgYWBC/0 /6QLJar7dII2gDGjesMdrOjcehBLA0yBctr1V2NNs3xbWD0dJwBOrA+uKEYe3PBG584PD2 j5jHK5TpYWBrEuWlDDmOZSwoHccPmIdxoFTeXg7IEFHQIDHTwU5ZR6uxSFOrEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZ7Gb0CZgz120D for ; Tue, 01 Sep 2026 14:17:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d3c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 01 Sep 2026 14:17:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 61c2141f50e6 - stable/15 - diff3: Use a format string to quiet a compiler warning 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 61c2141f50e689f835d0f2c15a98930c66ec917c Auto-Submitted: auto-generated Date: Tue, 01 Sep 2026 14:17:06 +0000 Message-Id: <6a96de62.1d3c3.4d19cf62@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=61c2141f50e689f835d0f2c15a98930c66ec917c commit 61c2141f50e689f835d0f2c15a98930c66ec917c Author: Ed Maste AuthorDate: 2025-11-18 13:21:03 +0000 Commit: Ed Maste CommitDate: 2026-09-01 14:01:56 +0000 diff3: Use a format string to quiet a compiler warning And bump WARNS to 2 (cherry picked from commit fd52a9becc62f721ad6a61c7301559afaedee010) --- contrib/diff/src/diff3.c | 2 +- gnu/usr.bin/diff3/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c index d0e8137756db..3062f3419865 100644 --- a/contrib/diff/src/diff3.c +++ b/contrib/diff/src/diff3.c @@ -1405,7 +1405,7 @@ output_diff3 (FILE *outputfile, struct diff3_block *diff, line = 0; do { - fprintf (outputfile, line_prefix); + fprintf (outputfile, "%s", line_prefix); cp = D_RELNUM (ptr, realfile, line); length = D_RELLEN (ptr, realfile, line); fwrite (cp, sizeof (char), length, outputfile); diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 568733801a6b..8774039b5d08 100644 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -17,6 +17,6 @@ CFLAGS+=-I${SRCTOP}/contrib/diff/lib CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\" -WARNS?= 0 +WARNS?= 2 .include