From nobody Thu Feb 2 20:39:40 2023 X-Original-To: dev-commits-src-all@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 4P79d845qcz3kYQj; Thu, 2 Feb 2023 20:39:40 +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 4P79d83WQkz4NRC; Thu, 2 Feb 2023 20:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675370380; 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=KbBeYwOyEJEg88qP0iuTjJ91wQqfZ/am42wEttf/QS8=; b=AsJTLAiiMTpivy0uLFtZS0E8qzKGZ149Xx+pSaTv4iQc3+dR9GaEVgozxnucWaiaNlA2i9 yLcDRkw9EebG2HmqZcHGz70RhR5hasYt9MIE74nKIO+i03ys6dMHRdVW3LZNjRSCGwAJGw qN45753+1q6vQXszf74J8iltruvIBcLMdTeJW3i0nOsUoDrr6v32wRH1aVfhRgVmIMUjAA 2t/tSkVFtR7cdvGX1QCqqVKYk6WSv5/Ak0cs4vnUFnGDZiHPB2eCEXOOfaezTIewcEb5yn PbSHZ3zwZW5MocIBXQrNaoV7hL8uBaxHsxthBiuZ8Mh5PGcxk5wH4MLTjuE+4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675370380; 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=KbBeYwOyEJEg88qP0iuTjJ91wQqfZ/am42wEttf/QS8=; b=v2hq89ja9gpWew5SdK+SmmMw/ssRa6Vw2YvdRDhhj/M4O1ut58dNTj5Cx9Rs11sQxw3PHe QYihBS45drlcPiVJlaR02rj/51ztq/sWOSnrcCs6r3dMkdjDoYMUuors9jioc1xz4wkg45 NsxJAtQGeFqum240qCOgKTzejabLRsDf813Uev41Xpq3wRVnXGUScqWuXe8ZB/pQ2joDbA O9Ffk9gV7sBMh2/ZyXQxGldf/N1KN1kdcYoX972gy4/UGrM2lD1WbTJRpFTq1nz/SrW7Es kd3JLD0KJXWtYUItX27g8YwIHDifJQWm3piVQmmgDI0i1s+FWlHi2qX0J2Ukvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675370380; a=rsa-sha256; cv=none; b=Hg0TdjkoufoBmOMhQ7jTItzqD+vGhn4be4Izj+sD16aWpst7+gO7e2CnyU8Eaj3CeISvQg 0GDoOpum2/DMzl87+7DnzfBgK0F8jyRAP4RBUVGQK6GxGqVhsptVViBj47Utk9OJMD6UCv KMlOx989cqFQ8OKuAdebLxEC+s9zdvMqsQaHxZHWSAzv5mRrl/9IpobdAifwG9mnohKPMC CQaaK3QAcMPpfhoDeUrFgLGxnWfGb8+jNtrzFOi9ryzhBUZNUYGSVDIrvxe/u5S0hYLAbU /cOB7aFKsaSvipi0t/Kd7+pOM2nPX79AOU3Q3dB143oSuntfM6DDbJ3ID3MshA== 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 4P79d82XQFz17C3; Thu, 2 Feb 2023 20:39:40 +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 312Kdei0078660; Thu, 2 Feb 2023 20:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 312KdedK078659; Thu, 2 Feb 2023 20:39:40 GMT (envelope-from git) Date: Thu, 2 Feb 2023 20:39:40 GMT Message-Id: <202302022039.312KdedK078659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: fb53e7adaf5b - main - tarfs: Fix 32-bit build. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb53e7adaf5b45ca08f650babc40077deff5e9af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb53e7adaf5b45ca08f650babc40077deff5e9af commit fb53e7adaf5b45ca08f650babc40077deff5e9af Author: Dag-Erling Smørgrav AuthorDate: 2023-02-02 20:36:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-02 20:39:10 +0000 tarfs: Fix 32-bit build. Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. --- sys/fs/tarfs/tarfs_subr.c | 6 +++--- sys/fs/tarfs/tarfs_vfsops.c | 4 ++-- sys/fs/tarfs/tarfs_vnops.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/fs/tarfs/tarfs_subr.c b/sys/fs/tarfs/tarfs_subr.c index d4bd4e702e08..0aec225dead9 100644 --- a/sys/fs/tarfs/tarfs_subr.c +++ b/sys/fs/tarfs/tarfs_subr.c @@ -137,7 +137,7 @@ tarfs_print_node(struct tarfs_node *tnp) printf("\tvnode %p\n", tnp->vnode); printf("\ttmp %p\n", tnp->tmp); printf("\ttype %d\n", tnp->type); - printf("\tino %lu\n", tnp->ino); + printf("\tino %lu\n", (unsigned long)tnp->ino); printf("\tsize %zu\n", tnp->size); printf("\tname %s\n", (tnp->name == NULL) ? "<>" : tnp->name); @@ -146,7 +146,7 @@ tarfs_print_node(struct tarfs_node *tnp) printf("\tgid %d\n", tnp->gid); printf("\tmode o%o\n", tnp->mode); printf("\tflags %u\n", tnp->flags); - printf("\tnlink %lu\n", tnp->nlink); + printf("\tnlink %lu\n", (unsigned long)tnp->nlink); printf("\tatime %d\n", (int)tnp->atime.tv_sec); printf("\tmtime %d\n", (int)tnp->mtime.tv_sec); printf("\tctime %d\n", (int)tnp->ctime.tv_sec); @@ -162,7 +162,7 @@ tarfs_print_node(struct tarfs_node *tnp) break; case VBLK: case VCHR: - printf("\trdev %lu\n", tnp->rdev); + printf("\trdev %lu\n", (unsigned long)tnp->rdev); break; default: break; diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index fe135116c985..a45f005a2bd1 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -522,8 +522,8 @@ again: /* extended header? */ if (hdrp->typeflag[0] == TAR_TYPE_GLOBAL_EXTHDR) { - printf("%s: unsupported global extended header at %zd\n", - __func__, TARFS_BLOCKSIZE * (blknum - 1)); + printf("%s: unsupported global extended header at %zu\n", + __func__, (size_t)(TARFS_BLOCKSIZE * (blknum - 1))); error = EFTYPE; goto bad; } diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c index a40499982229..a70a077424b4 100644 --- a/sys/fs/tarfs/tarfs_vnops.c +++ b/sys/fs/tarfs/tarfs_vnops.c @@ -255,7 +255,7 @@ tarfs_readdir(struct vop_readdir_args *ap) struct vnode *vp; struct uio *uio; int *eofflag; - u_long **cookies; + uint64_t **cookies; int *ncookies; off_t off; u_int idx, ndirents; @@ -542,7 +542,7 @@ tarfs_print(struct vop_print_args *ap) tnp = VP_TO_TARFS_NODE(vp); printf("tag tarfs, tarfs_node %p, links %lu\n", - tnp, tnp->nlink); + tnp, (unsigned long)tnp->nlink); printf("\tmode 0%o, owner %d, group %d, size %zd\n", tnp->mode, tnp->uid, tnp->gid, tnp->size);