From nobody Sun Apr 30 00:55:59 2023 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 4Q87FD2gphz48VPm; Sun, 30 Apr 2023 00:56:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q87FD1m5gz46FN; Sun, 30 Apr 2023 00:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682816160; 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=hZY6Q4LyLNELuIyh4PCgEi6vBOpRsRnjuZZADpKMzqo=; b=Q3VpFmAa2qS+KZK2F02JPcOzkqL3iqwIsbu/DruY81qebL5OI3EpkrjrOCfW3hDfoeiZY9 yWbRgojru2XqykLkxePpc1Wli1XinqCBKrhZKZD9QagFtA6NWIKawJ+yfYgBw7KQrlVxvq //em6BmV+Cs34U5SeH80fl8IBAUkI4lLT/H5F9Gh4z9maAIUZr4HEkVo/Jucmj2GuXHfr9 D0dJNf6zU7ivDibH+ZSg8NVTDccyhlcMUCHq35sM8Nkg87WCiWBSWQrTvUwizJbbGXucRM Kv1W9lvJQtgF4bNyikKTAvTVjjHsZpxpD+cHUAbxXRGCV9+tYemJqeH9WkPK9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682816160; 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=hZY6Q4LyLNELuIyh4PCgEi6vBOpRsRnjuZZADpKMzqo=; b=TecT1JHEfrq7yD037HETC+r0t1+KYJZ3SZzi/dHmkbmgVB6dNKx7rVG7yEmFORpS8LuyXt lDeUr+gmxiHUa+Ch9F91jF+y1J8jnj3hD+vCznmeWMjGz190xGjLx6QEEzTR97roX/Obd9 A7mkUS0tscMsV5lWlF30R8jegg0cGsgJo6cjQw35txMENxvNfCBZvyVuxONv5swq9ldxEQ I+C6TWtkYRDFlSxmwIyF9bt9Aqo4MfKlkyr4FcyllLhz7SLUHv/mtFmoBBcfgeZM2XbUIV v3/8haWp1IT62DnKKWuqXJ/juyobnMA4OMvPALqCKBSWGiv9lSAFV3IUh8SQNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682816160; a=rsa-sha256; cv=none; b=c+EE5O5tG/IQMnpyuR2dAKi/f+9DAbzs6Dh1ppJ0nqTHUZfDydvkmOZ1z5xrc778ZIKdsk EZcev+ioXlOsh4uhU4IYY9INa4QeZ8Fm54/JO3N6ZaPUr+/8xn8acd2MarZ6Zwn02VLeZo DeQ8sck33K+2/LWvEaFDZDXrUdPWF8Y0ywXn6BpvhrtaFDIhTO3L0FbtYqY4QJrbxVPw7L YJToVYnN25WMFKUMLnoLlpjTofuRL7LV7mnIKoeg770kWhNvuH442cYMVikoR6Hbdrt4uY Q2ZvpUpVN8/A6NaMvSRAf4bdmDbUMQRT+V9f8G62wDBjWCeYfqPvY6oan3eH/A== 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 4Q87FD0mMMz12rF; Sun, 30 Apr 2023 00:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33U0txwk076744; Sun, 30 Apr 2023 00:55:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33U0txC4076743; Sun, 30 Apr 2023 00:55:59 GMT (envelope-from git) Date: Sun, 30 Apr 2023 00:55:59 GMT Message-Id: <202304300055.33U0txC4076743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 6995e6b3237e - main - Fix printf format conflict 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6995e6b3237e9be9ae6f68af13edd3db4b668ab8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=6995e6b3237e9be9ae6f68af13edd3db4b668ab8 commit 6995e6b3237e9be9ae6f68af13edd3db4b668ab8 Author: Kirk McKusick AuthorDate: 2023-04-30 00:55:15 +0000 Commit: Kirk McKusick CommitDate: 2023-04-30 00:55:15 +0000 Fix printf format conflict MFC after: 1 week --- sbin/dumpfs/dumpfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 01b475a03fea..743734660e57 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -245,7 +245,7 @@ dumpfs(const char *name, int dosb) default: goto err; } - printf("old_cpg\t%d\tsize_cg\t%jd\tCGSIZE\t%jd\n", + printf("old_cpg\t%d\tsize_cg\t%d\tCGSIZE\t%d\n", afs.fs_old_cpg, sizeof(struct cg), CGSIZE(&afs)); printf("sblkno\t%d\tcblkno\t%d\tiblkno\t%d\tdblkno\t%d\n", afs.fs_sblkno, afs.fs_cblkno, afs.fs_iblkno, afs.fs_dblkno);