From nobody Tue Sep 01 14:17:06 2026 X-Original-To: dev-commits-src-branches@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 4hZ7GV3h8mz6qwtt for ; Tue, 01 Sep 2026 14:17:06 +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 4hZ7GV1yzBz3vHc for ; Tue, 01 Sep 2026 14:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788272226; 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=t6+EJAyhKnHseio/JLmAtOzSaKsQ+o/j0iODEEidN/239jsViJjR9+WSlexNTtxUOcRxJb lYSrKtBoP40hk3Ce3dHS8ixoTMqbryBg7PaC9B1WoTlhZAMInRcZfD2J7ajM099dUN7YW7 3CAfohr/lDP/31oKWHgJs3viiYQCOECttvovMhfdNpf+2KWUhV28c+ihVK25ATzS0R/jK5 ENZd6y2odRos6qt6SVCxar6tYS16SEHzptd1/kSjUFb6AeyhydUhnpAMkzEce2QL7akJY8 sFbABUktRXBPC6BjnNWVUd11drEqhfPqh3n5vO8czb+FqK9HEA3KsZWQLmMNcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788272226; a=rsa-sha256; cv=none; b=K07e77DWDldjHm/jeyviIbrVCOeswV5yXchNvo4eR4wDNyIpL+I/By/9UQ3kb6ecpv8P7H MAr8jBUjnzQd1pstB1/e9kOGDqiva44YVDkkkmQnkvfi0RxhjHkE+gnmcYLtntv+9GMB2n Lfl9A+nXe6zFAOAW1hfVLGEejDFUIIC1lbBqefEb8yno1sIxM2pVuQYx2TFM1yOfvyfI4O Ig9ySuH6iMwWZtiRGclce2jE3IozHEJfrCOP5XQV5kxqRYEkJHqbt10Ey+/8ElbAn+gZ6c 8s9QbztturP/oAYOdZshCWKfvtPvFGu+09n8LbCtt64GR/j4xyFEATeB7xxOKw== 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=1788272226; 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=HQB3rjk35Ha9iHrTDtjEWam4cxMWwqTDosrxdJAzTFcfyamAa2R3hnMOqmVmqV8JJR0yLN puXbYgOT8OPUggslA9jWj6R1uf2qdqEsTbuucZx9M8ziPImGSPUcB52jyOYCXqmsX4Kbm+ sG5aMG+sWiaQnPUvVMgtkxNrKZG9LIJqKWp6siNEYwhmOsF58ykjwRRM4MBd6SAiCHFkv9 isKXUXEuDTDoR5G/WBLBLyhE6mJFylauqCJmEukDg3k4iqFQxUSmYSVg0r+ji6J2qE0io9 kLXma4byP1C/d99bugucvXzuPRD2S863I5TeHOSOvNBPOtJRljveZubq+SaflQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZ7GV0fmQz11Dd for ; Tue, 01 Sep 2026 14:17:06 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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