diff options
| author | Martin Matuška <martin@matuska.org> | 2018-11-25 09:02:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-25 09:02:24 +0100 |
| commit | 3525465190b23ba079518abcc40607e1e411b787 (patch) | |
| tree | a5a34fb7f2a38033d596533d5c6cafd8bf6996d3 | |
| parent | a6b096b596ec7780a0aa3b1f3d29f6aa22fe106e (diff) | |
| parent | 9e2d778f3a1044720e92eba86c28a9b98866c408 (diff) | |
| download | libarchive-3525465190b23ba079518abcc40607e1e411b787.tar.gz | |
Merge pull request #1087 from DerDakon/read-var
tests: fix compile error with -Wshadow on older gcc releases
| -rw-r--r-- | libarchive/test/test_read_format_rar5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c index 6c570f1c..0ccedc76 100644 --- a/libarchive/test/test_read_format_rar5.c +++ b/libarchive/test/test_read_format_rar5.c @@ -90,7 +90,7 @@ int verify_data(const uint8_t* data_ptr, int magic, int size) { static int extract_one(struct archive* a, struct archive_entry* ae, uint32_t crc) { - la_ssize_t fsize, read; + la_ssize_t fsize, bytes_read; uint8_t* buf; int ret = 1; uint32_t computed_crc; @@ -100,9 +100,9 @@ int extract_one(struct archive* a, struct archive_entry* ae, uint32_t crc) { if(buf == NULL) return 1; - read = archive_read_data(a, buf, fsize); - if(read != fsize) { - assertEqualInt(read, fsize); + bytes_read = archive_read_data(a, buf, fsize); + if(bytes_read != fsize) { + assertEqualInt(bytes_read, fsize); goto fn_exit; } |