diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2006-11-24 05:48:04 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2006-11-24 05:48:04 +0000 |
| commit | 6770b130f1880ea2e3a52e30f723961de2bdda99 (patch) | |
| tree | 06a33d781507a642e67db2348ff9772afb8d4795 | |
| parent | 4f27e916114a3fd1cd55305773c5adf034aab56a (diff) | |
Notes
| -rw-r--r-- | lib/libarchive/archive_write_set_format_pax.c | 4 | ||||
| -rw-r--r-- | lib/libarchive/archive_write_set_format_ustar.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libarchive/archive_write_set_format_pax.c b/lib/libarchive/archive_write_set_format_pax.c index 657a72089862f..c796e858f7e74 100644 --- a/lib/libarchive/archive_write_set_format_pax.c +++ b/lib/libarchive/archive_write_set_format_pax.c @@ -805,7 +805,7 @@ archive_write_pax_header(struct archive *a, } pax->entry_bytes_remaining = archive_strlen(&(pax->pax_header)); - pax->entry_padding = 0x1ff & (- pax->entry_bytes_remaining); + pax->entry_padding = 0x1ff & (-(int64_t)pax->entry_bytes_remaining); r = (a->compression_write)(a, pax->pax_header.s, archive_strlen(&(pax->pax_header))); @@ -834,7 +834,7 @@ archive_write_pax_header(struct archive *a, */ archive_entry_set_size(entry_original, archive_entry_size(entry_main)); pax->entry_bytes_remaining = archive_entry_size(entry_main); - pax->entry_padding = 0x1ff & (- pax->entry_bytes_remaining); + pax->entry_padding = 0x1ff & (-(int64_t)pax->entry_bytes_remaining); archive_entry_free(entry_main); return (ret); diff --git a/lib/libarchive/archive_write_set_format_ustar.c b/lib/libarchive/archive_write_set_format_ustar.c index 53ef37be2083a..b4aa48a8dd2af 100644 --- a/lib/libarchive/archive_write_set_format_ustar.c +++ b/lib/libarchive/archive_write_set_format_ustar.c @@ -178,7 +178,7 @@ archive_write_ustar_header(struct archive *a, struct archive_entry *entry) return (ret); ustar->entry_bytes_remaining = archive_entry_size(entry); - ustar->entry_padding = 0x1ff & (- ustar->entry_bytes_remaining); + ustar->entry_padding = 0x1ff & (-(int64_t)ustar->entry_bytes_remaining); return (ARCHIVE_OK); } @@ -431,7 +431,7 @@ format_octal(int64_t v, char *p, int s) p += s; /* Start at the end and work backwards. */ while (s-- > 0) { - *--p = '0' + (v & 7); + *--p = (char)('0' + (v & 7)); v >>= 3; } |