git: 0238d3711d9b - main - tarfs: Fix 32-bit build.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Apr 2024 14:24:56 UTC
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0238d3711d9b888f678fce4274eccc9175168395 commit 0238d3711d9b888f678fce4274eccc9175168395 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2024-04-03 14:24:05 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2024-04-03 14:24:05 +0000 tarfs: Fix 32-bit build. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44613 --- sys/fs/tarfs/tarfs_vfsops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index cbc3d88eaad8..365234113168 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -80,7 +80,7 @@ struct ustar_header { CTASSERT(sizeof(struct ustar_header) == TARFS_BLOCKSIZE); -#define TAR_EOF ((off_t)-1) +#define TAR_EOF ((size_t)-1) #define TAR_TYPE_FILE '0' #define TAR_TYPE_HARDLINK '1' @@ -430,13 +430,13 @@ tarfs_free_mount(struct tarfs_mount *tmp) * failure. */ static int -tarfs_alloc_one(struct tarfs_mount *tmp, off_t *blknump) +tarfs_alloc_one(struct tarfs_mount *tmp, size_t *blknump) { char block[TARFS_BLOCKSIZE]; struct ustar_header *hdrp = (struct ustar_header *)block; struct sbuf *namebuf = NULL; char *exthdr = NULL, *name = NULL, *link = NULL; - off_t blknum = *blknump; + size_t blknum = *blknump; int64_t num; int endmarker = 0; char *namep, *sep; @@ -861,7 +861,7 @@ tarfs_alloc_mount(struct mount *mp, struct vnode *vp, struct thread *td = curthread; struct tarfs_mount *tmp; struct tarfs_node *root; - off_t blknum; + size_t blknum; time_t mtime; int error;