From nobody Fri May 19 23:54:21 2023 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 4QNNws5sFJz4CX2P; Fri, 19 May 2023 23:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QNNws3JNJz3txh; Fri, 19 May 2023 23:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540461; 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=30mlZpAqRF1/asZxqsIU4N9zxXmCmip2fZveIEhFnLg=; b=FosEyg4e40OWBiVa2c1q/yKrFg1so3SYtgKle5VaHtedjFaFDY2vRzQdSuOZvBONLrT32G JSkRxa1zGETnaDqgt5odqQiWfQsevsQPosxeZG8MJhqmn3UGbJFeCgrSR/t3WKfUvjw8+o OiskWPraN0dveS3B8nJyyTEu6+8TemggIZ+9UYvvJpTxyToPkurN2yDd9QKM6/x4PQt2oN VZO5IRKOnrgHFcOxtF9KKm2xlSWxwakVf+bfpsRzJZEv+n2fdwvZivtELnhUAng5DfItkH IcN3ZfQcQfIkjlaVPE3duy6HAeFil9qD3+fJRjb2WoA7dRwv6/j9OVyxaaL+qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540461; 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=30mlZpAqRF1/asZxqsIU4N9zxXmCmip2fZveIEhFnLg=; b=ptidIJNhpBGITmYCqqK6+d4YA5yohK3t/ZsCA4sIUEin4V/3pWjJ2YMMcZuC0LsAx0x8au 8FghB6trV+su7/cEqHSvhbVOn1MtBwdgGIwBkw8x4NEdEzW+oKXB8RtlKluATF6eQbSnK0 HL3ajP5BkyaYRY5VMyB6ItDmk69VuGnVVngOL6UojH50CMEkx9oJ6lAaDTqDbmCk0ZJOX9 hDWSIeMKhQV7MAMlMFCfCwWwMjgTx3tpGUEEHtoKabqTgZOgtcjOkWUyOOJVzTamdVJglk hjPbsC+w8f0C2LgOdWFoy1t/shIG75NOKT8Wceyr0U4j1q3JoSz+qLLpTpsdfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684540461; a=rsa-sha256; cv=none; b=j2+sUifFIJqslZ0inpmV5JD18nnhGTC31SNtJiSFRbfHu+Gs2cxfcpm7POwqunUrjQb7uf dNM+oPi8L79Mh6624aVdmzKayJhPq/S9wKTZrMDNVbs6DuarhHY4e1ptTgv/xDqxRZAexJ fIROzV0/32uin+QRUeCa9GdddOb71xwqpHfVyFPconk9aI24z/V7kM/4pI6nPYl7BkpR95 mRpNtWaidTeizfnz5V2f7BocbJp6yD8N+U2TdcY9adwQnZN67myYUywClge5MbBcDm2Tuj E25NVVEIz255klnKktah6Chf35wbnS6jMuGd/D8yu/ghsCSiCLxZCta+MQTDHw== 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 4QNNws29KcznqP; Fri, 19 May 2023 23:54:21 +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 34JNsLlx064723; Fri, 19 May 2023 23:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JNsLlh064722; Fri, 19 May 2023 23:54:21 GMT (envelope-from git) Date: Fri, 19 May 2023 23:54:21 GMT Message-Id: <202305192354.34JNsLlh064722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 4921003d448e - stable/13 - Fix printf format conflict 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4921003d448edfec819def5022026367dfe1564c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=4921003d448edfec819def5022026367dfe1564c commit 4921003d448edfec819def5022026367dfe1564c Author: Kirk McKusick AuthorDate: 2023-04-30 00:55:15 +0000 Commit: Kirk McKusick CommitDate: 2023-05-19 22:37:40 +0000 Fix printf format conflict (cherry picked from commit 6995e6b3237e9be9ae6f68af13edd3db4b668ab8) --- 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 034dcb5ddf99..d521b806af40 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -244,7 +244,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);