Skip to content

Commit c39372f

Browse files
authored
Fix compilation warnings (libarchive#2246)
Fix warnings I'm hitting, at least with MSVC
1 parent b7b0c7c commit c39372f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

libarchive/archive_read_support_format_rar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3690,7 +3690,7 @@ execute_filter_e8(struct rar_filter *filter, struct rar_virtual_machine *vm, siz
36903690
{
36913691
uint32_t currpos = (uint32_t)pos + i + 1;
36923692
int32_t address = (int32_t)vm_read_32(vm, i + 1);
3693-
if (address < 0 && currpos >= -(uint32_t)address)
3693+
if (address < 0 && currpos >= (~(uint32_t)address + 1))
36943694
vm_write_32(vm, i + 1, address + filesize);
36953695
else if (address >= 0 && (uint32_t)address < filesize)
36963696
vm_write_32(vm, i + 1, address - currpos);

libarchive/archive_read_support_format_tar.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,13 +2476,13 @@ pax_attribute(struct archive_read *a, struct tar *tar, struct archive_entry *ent
24762476
}
24772477
else if (key_length == 8 && memcmp(key, "devmajor", 8) == 0) {
24782478
if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
2479-
archive_entry_set_rdevmajor(entry, t);
2479+
archive_entry_set_rdevmajor(entry, (dev_t)t);
24802480
}
24812481
return (err);
24822482
}
24832483
else if (key_length == 8 && memcmp(key, "devminor", 8) == 0) {
24842484
if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
2485-
archive_entry_set_rdevminor(entry, t);
2485+
archive_entry_set_rdevminor(entry, (dev_t)t);
24862486
}
24872487
return (err);
24882488
}
@@ -2505,7 +2505,7 @@ pax_attribute(struct archive_read *a, struct tar *tar, struct archive_entry *ent
25052505
}
25062506
else if (key_length == 3 && memcmp(key, "dev", 3) == 0) {
25072507
if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
2508-
archive_entry_set_dev(entry, t);
2508+
archive_entry_set_dev(entry, (dev_t)t);
25092509
}
25102510
return (err);
25112511
}
@@ -2517,7 +2517,7 @@ pax_attribute(struct archive_read *a, struct tar *tar, struct archive_entry *ent
25172517
}
25182518
else if (key_length == 5 && memcmp(key, "nlink", 5) == 0) {
25192519
if ((err = pax_attribute_read_number(a, value_length, &t)) == ARCHIVE_OK) {
2520-
archive_entry_set_nlink(entry, t);
2520+
archive_entry_set_nlink(entry, (unsigned int)t);
25212521
}
25222522
return (err);
25232523
}

0 commit comments

Comments
 (0)