mirrors/tar
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/tar.git synced 2026-04-28 12:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefer off_t to uintmax_t for continued_file_*

Browse Source 
* src/buffer.c (continued_file_size, continued_file_offset):
Now off_t, not uintmax_t.  All uses changed.
* src/common.h (UINTMAX_FROM_HEADER):
* src/list.c (uintmax_from_header):
Remove; unused.
* src/list.c (simple_print_header):
* src/xheader.c (volume_size_decoder, volume_offset_decoder):
Treat offset as off_t, not uintmax_t.
This commit is contained in:
Paul Eggert
2024-11-01 09:40:36 -07:00
parent c0ef66da92
commit d68c37b640
4 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/buffer.c
View File

@@ -97,8 +97,8 @@ static void (*flush_read_ptr) (void);
char *volume_label;
char *continued_file_name;
uintmax_t continued_file_size;
uintmax_t continued_file_offset;
off_t continued_file_size;
off_t continued_file_offset;
static int volno = 1; /* which volume of a multi-volume tape we're
@@ -1523,9 +1523,9 @@ try_new_volume (void)
tar_stat_destroy (&dummy);
ASSIGN_STRING_N (&continued_file_name, current_header->header.name);
continued_file_size =
UINTMAX_FROM_HEADER (current_header->header.size);
OFF_FROM_HEADER (current_header->header.size);
continued_file_offset =
UINTMAX_FROM_HEADER (current_header->oldgnu_header.offset);
OFF_FROM_HEADER (current_header->oldgnu_header.offset);
break;
default:
@@ -1559,25 +1559,25 @@ try_new_volume (void)
}
}
uintmax_t s;
off_t s;
if (ckd_add (&s, continued_file_size, continued_file_offset)
|| s != bufmap_head->sizetotal)
{
paxwarn (0, _("%s is the wrong size (%jd != %ju + %ju)"),
paxwarn (0, _("%s is the wrong size (%jd != %jd + %jd)"),
quote (continued_file_name),
intmax (bufmap_head->sizetotal),
uintmax (continued_file_size),
uintmax (continued_file_offset));
intmax (continued_file_size),
intmax (continued_file_offset));
return false;
}
if (bufmap_head->sizetotal - bufmap_head->sizeleft
!= continued_file_offset)
{
paxwarn (0, _("This volume is out of sequence (%jd - %jd != %ju)"),
paxwarn (0, _("This volume is out of sequence (%jd - %jd != %jd)"),
intmax (bufmap_head->sizetotal),
intmax (bufmap_head->sizeleft),
uintmax (continued_file_offset));
intmax (continued_file_offset));
return false;
}
}