From nobody Fri Feb 13 20:20:04 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 4fCNnc6MCCz6RlgW for ; Fri, 13 Feb 2026 20:20:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCNnc5dkzz3Nwk for ; Fri, 13 Feb 2026 20:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771014004; 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=3+56xX5dlLXj+I2NOLsfrknX2RnoMYqSX1gccQfzpHo=; b=DKqKfRZfBqmAOPsEKbvjpXSTOLzPOyBOqsegC0F5pjOb0t6wx8Cwtm9tjCXVigYI8HkH4n Iwino7FkEAGdjypytbuqfFRR0wSLKaC/ZCqJcRABLy9RIYaSbaeayyG5dO5/cxeJ8Sgpqb OVnXppQKg2PhdVrnAOeanbZtdMyYIrN9vIl3Yo7lE3qYfWYZLLKXMWbitsaRG5spj9m4gr jEXEewX5NRdlXr8UXWEMACRtqGomD8tKwe+BtiuX/XW2NghB9XY8L2qib1em9lxiZXSIbA UDtZi++X7kYVJgAt3D88wfWnaI/MJn4xDHzbQk/jALYvbOaesN1lfDtVqW/ubw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771014004; a=rsa-sha256; cv=none; b=VTBwyaICgC0rrphitmqAOcqix5J9j7XzVyvWmhAaR2GVRc/YJdjacUne7y9z+THD+7ph2l j2QfvuPyFVGXBvkpGNE2YUkv4C9eICUNC1/+/DfxJs3xdCmrxeMWEl0BzN1BMeaAzGXO20 UG6+lrt73mYG2WFwyq3P3ofpur3VXJzDYpEFgR1FOetBFkHpDcefjwdTn6cpL15akaWLVN MNh1JQH2Xc3BJOncrdnKKng/NeG8Rd2MnFDZ62mPErZP8Y4hhoGYDfbpx4tmrzuwU3VOAn EkkHVOsTYOXNkdpOpVhbnBWE9J7NSLXU4l63VYH2jWGUdgq5sVWnfsq4jrqFJQ== 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=1771014004; 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=3+56xX5dlLXj+I2NOLsfrknX2RnoMYqSX1gccQfzpHo=; b=RQ+rYOq+T5MdmXD9ZdVNauI0Tw7Z71+X7w9UFtxCs/utBDXnN4k3HjHntdqUs+WNRZCUCp s1Hjx1ddQgjHMK5NAwFopb4Hl7jZSViPxF78v/bI2XvBMEKXaLTjeskQ0cQ/Kq/aMBY/RH EhbqgGG0NVMqQYhkmmPI1DRaZGw0pTsFDFkP3osqHMBfzej4DTVoD+Ih2kv8yswkiEwB2y 9HN52chjshAhLxk4v24h2FhKHhRl0BzQFaGO0htPHhhzNRKXLAD/BPhlYpUWJ9nKepWMNw xMZUTyEZz1/jGdNQm3QS35nzC62dgAdd5gPYOm2cYniCN1L9ECwVPJrIsM9Caw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCNnc55lTzcjg for ; Fri, 13 Feb 2026 20:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 20:20:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fd52a9becc62 - main - diff3: Use a format string to quiet a compiler warning 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd52a9becc62f721ad6a61c7301559afaedee010 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 20:20:04 +0000 Message-Id: <698f8774.454b3.4117bf11@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fd52a9becc62f721ad6a61c7301559afaedee010 commit fd52a9becc62f721ad6a61c7301559afaedee010 Author: Ed Maste AuthorDate: 2025-11-18 13:21:03 +0000 Commit: Ed Maste CommitDate: 2026-02-13 20:19:58 +0000 diff3: Use a format string to quiet a compiler warning And bump WARNS to 2 --- 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