From nobody Sun Apr 30 02:55:34 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 4Q89vG37v6z48ccg for ; Sun, 30 Apr 2023 02:55:38 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q89vF5K70z4HV5 for ; Sun, 30 Apr 2023 02:55:37 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-3f1958d3a53so12130525e9.0 for ; Sat, 29 Apr 2023 19:55:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682823336; x=1685415336; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n4ZyMHXKp+0udcpaoV0CioTcSVB62bd3xZLxtR76/xg=; b=LI5XVAN3AYvQLqLqtb7i5Jrx9NW/xrhMat/Lhyt7+16N7i/1W7rkGuSPkhBUtoTLVq wnxFXRoZpUgfJ+ZWWBeIouhemXbcfYQUyeC+Bm2kYE9nsILZroMroG0PqNRUmMAYayRt rpgdwsZSdBqf3D7Rernk1ufcVjfUfcX1gWPisho/5p52AUARRS8crK76DsIzOg/+0f3P tSjKbnLNIGAwu1Z7sd61vWzE+yS9M7BxpQZsfNtJ1oN28QeL4AviGoH2lycXvx+wb534 bE7jhHRZT2+ydPJC+QsNMV6Xbm9sHpbuF9FJfQLcf7nMyzp6zVLu5Oxsk80rgS+4ej/M KwcA== X-Gm-Message-State: AC+VfDzQiYQMtMyALlEPRZUmmL1OQC/fymjMlRcgzMRJLqCQHWhaG5mm ESEjIWljQs8hSH+r4xNRsrFppw== X-Google-Smtp-Source: ACHHUZ6hs4HwIPL6iNx7fKT4fkBocyOhEEe+VJYf/N4gctrUTP+kydPsnXIk6+lqryiyZxoeFVIKDg== X-Received: by 2002:a1c:7312:0:b0:3f3:2e4e:c738 with SMTP id d18-20020a1c7312000000b003f32e4ec738mr2785833wmb.3.1682823335989; Sat, 29 Apr 2023 19:55:35 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id k25-20020a05600c081900b003f17122587bsm31956419wmp.36.2023.04.29.19.55.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Apr 2023 19:55:35 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: 6995e6b3237e - main - Fix printf format conflict From: Jessica Clarke In-Reply-To: Date: Sun, 30 Apr 2023 03:55:34 +0100 Cc: Kirk McKusick , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <164F1299-0F3D-424C-8A76-C0FD8239B31C@freebsd.org> References: <202304300055.33U0txC4076743@gitrepo.freebsd.org> To: Rick Macklem X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spamd-Result: default: False [-1.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_LONG(-1.00)[-0.995]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_SHORT(-0.01)[-0.008]; FREEFALL_USER(0.00)[jrtc27]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TAGGED_RCPT(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.50:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_EQ_ADDR_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.50:from]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Queue-Id: 4Q89vF5K70z4HV5 X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N On 30 Apr 2023, at 03:54, Rick Macklem wrote: >=20 > On Sat, Apr 29, 2023 at 7:17=E2=80=AFPM Jessica Clarke = wrote: >>=20 >> CAUTION: This email originated from outside of the University of = Guelph. Do not click links or open attachments unless you recognize the = sender and know the content is safe. If in doubt, forward suspicious = emails to IThelp@uoguelph.ca. >>=20 >>=20 >> On 30 Apr 2023, at 01:55, Kirk McKusick wrote: >>>=20 >>> The branch main has been updated by mckusick: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6995e6b3237e9be9ae6f68af13edd3db= 4b668ab8 >>>=20 >>> commit 6995e6b3237e9be9ae6f68af13edd3db4b668ab8 >>> Author: Kirk McKusick >>> AuthorDate: 2023-04-30 00:55:15 +0000 >>> Commit: Kirk McKusick >>> CommitDate: 2023-04-30 00:55:15 +0000 >>>=20 >>> Fix printf format conflict >>>=20 >>> MFC after: 1 week >>> --- >>> sbin/dumpfs/dumpfs.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>=20 >>> 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)); >>=20 >> size_t is not an int on 64-bit architectures; you want %zu. > Since size_t is 32 bits on some arches, don't you need to use %ju > and (uintmax_t)sizeof(struct cg)? No. %zu is size_t by definition. That=E2=80=99s the point of its = existence. Jess > rick >=20 >>=20 >> Jess >>=20 >>> 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);