From nobody Tue Sep 01 14:18:20 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 4hZ7Hx2h71z6qwcw for ; Tue, 01 Sep 2026 14:18:21 +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 4hZ7Hw5dXSz3vbL for ; Tue, 01 Sep 2026 14:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788272300; 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=1Vvr3QDtM7I5buBV24QC7HWpxEn6xf5HkMDCIc/8O5g=; b=Wn1WHHrHt4rUGO/lg3oIfFoCCqPscuoktGGMOogpGQtHtjxPI2uUrAxHdl/CuLM4COSRfm yIj0M78nXcEInaz2zAn/1Yb+5oI71wIF1rjHR+1yqVaeZqlwr0VEby33aa5aGdKNSz7R9k gEvJw7WXChLgIOOqlrH53ThaydQKJcrCxHaNFvznxNJV9rnP665AH6IdAgge3C/pweDhuM Rl48wirdsPwek2oDY5Eg4UmId3uDdOogKzv4P1BE9oUU6BBBqjsciw+m76skgalm992hbS S7fanChBvghSm6wzEiDu6+WJawqBOOFlOLOEpLlMjL/xvX/FZAbpKGcbVN2TUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788272300; a=rsa-sha256; cv=none; b=Ip8GSy2x4k6enUdzRIIRp9ETHRKl2KvmzBLrFMBcnkEibCzKx/73hWy4aqW2nNlWOGkyAs l+zdJpRjZYs4eAFiHqGfP8o9pW+IsGSVK4r7lqPNxUbdcTSH/boteT5KUhrX6QQq77FrIp MDQi20ptcA5saphYw4VY0Ly07/5FY7e3AUY+M7bJl1vtKfwvbA/hFW9fOYTn9OALa00KM6 2JG/nuVfcRL+DofY8xLPxTBec/6PsMyS80U99xuo3/kojQGXo6JxWp7wFq1S618JWp4qfe fJKvy7EftbCqkoZ4AemZTs9Bi/GguX0aSYQ/PbOAJPeDbfVIonH3XaGMu6hCyQ== 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=1788272300; 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=1Vvr3QDtM7I5buBV24QC7HWpxEn6xf5HkMDCIc/8O5g=; b=IZA3RsUl2A9KGCpqF7PsDIU1h2wZ9olpnWaT+pr3Qa9/WBMeV4CLibaH3/vzX6p1N6ml3c tkXYuWz/fiPtLL6AYoo2oFW6Obla6myC0hW67yQloZph1IwmU+TfwOzM2t6D+VXtlyvNp1 KyA31UGscXx9doQJMGI0qEezqAPuWFOff/UVIvm40g64G9wPVYaemnlH2Es2DBQEAfnk+B CSgPls/2/UT+P0KNLmire/jArjn3xSXeu/5ICS/T1UYeflUJbUIZC/YtLs3WDYhOa9snEQ 08EhGrpTC3BiRqHRlMxEToLW8aIpIfWeMA+KGk64yuF0Vo/JATwcKO9KUubCAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZ7Hw4VH8z11fx for ; Tue, 01 Sep 2026 14:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c4ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 01 Sep 2026 14:18:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 67854972ffde - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 67854972ffdea86df09ec2720cb3557d70819c9e Auto-Submitted: auto-generated Date: Tue, 01 Sep 2026 14:18:20 +0000 Message-Id: <6a96deac.1c4ee.799053ed@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=67854972ffdea86df09ec2720cb3557d70819c9e commit 67854972ffdea86df09ec2720cb3557d70819c9e Author: Ed Maste AuthorDate: 2025-11-18 13:21:03 +0000 Commit: Ed Maste CommitDate: 2026-09-01 14:18:06 +0000 diff3: Use a format string to quiet a compiler warning And bump WARNS to 2 (cherry picked from commit fd52a9becc62f721ad6a61c7301559afaedee010) (cherry picked from commit 61c2141f50e689f835d0f2c15a98930c66ec917c) --- 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 9d325c4418ca..2be9b9f38e58 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