summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Mejia <amejia004@gmail.com>2013-02-01 16:52:23 -0500
committerAndres Mejia <amejia004@gmail.com>2013-02-01 16:52:23 -0500
commitc13f7063433a82ba0179a8a9baf1adf04581a755 (patch)
treefea280db2a090e5bc44c2bd46a43373103a9f10c
parente3d1434212f6b644398cd67fb70e9b4ac86fdbc6 (diff)
downloadlibarchive-c13f7063433a82ba0179a8a9baf1adf04581a755.tar.gz
Fix test failures in libarchive built using Visual Studio.
Negating "sizeof" operator requires casting to appropriate primitive data type, in this commit, a cast to int.
-rw-r--r--libarchive/test/test_read_format_rar.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libarchive/test/test_read_format_rar.c b/libarchive/test/test_read_format_rar.c
index 2dcba03f..dc234e05 100644
--- a/libarchive/test/test_read_format_rar.c
+++ b/libarchive/test/test_read_format_rar.c
@@ -1196,7 +1196,7 @@ DEFINE_TEST(test_read_format_rar_multivolume_seek_data)
/* Seek to the end minus 64 bytes */
assertA(file_size - (int)sizeof(buff) ==
- archive_seek_data(a, file_size - sizeof(buff), SEEK_SET));
+ archive_seek_data(a, file_size - (int)sizeof(buff), SEEK_SET));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt1, sizeof(file_test_txt1) - 1);
@@ -1262,12 +1262,12 @@ DEFINE_TEST(test_read_format_rar_multivolume_seek_data)
assertEqualMem(buff, file_test_txt2, sizeof(file_test_txt2) - 1);
/* Seek to the middle of the combined data block */
- assertA(10054 == archive_seek_data(a, 10054 - sizeof(buff), SEEK_CUR));
+ assertA(10054 == archive_seek_data(a, 10054 - (int)sizeof(buff), SEEK_CUR));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt3, sizeof(file_test_txt3) - 1);
/* Seek to 32 bytes before the end of the first data sub-block */
- assertA(6860 == archive_seek_data(a, 6860 - (10054 + sizeof(buff)),
+ assertA(6860 == archive_seek_data(a, 6860 - (10054 + (int)sizeof(buff)),
SEEK_CUR));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt4, sizeof(file_test_txt4) - 1);
@@ -1350,12 +1350,12 @@ DEFINE_TEST(test_read_format_rar_multivolume_seek_multiple_files)
assertEqualMem(buff, file_test_txt2, sizeof(file_test_txt2) - 1);
/* Seek to the middle of the combined data block */
- assertA(10054 == archive_seek_data(a, 10054 - sizeof(buff), SEEK_CUR));
+ assertA(10054 == archive_seek_data(a, 10054 - (int)sizeof(buff), SEEK_CUR));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt3, sizeof(file_test_txt3) - 1);
/* Seek to 32 bytes before the end of the first data sub-block */
- assertA(7027 == archive_seek_data(a, 7027 - (10054 + sizeof(buff)),
+ assertA(7027 == archive_seek_data(a, 7027 - (10054 + (int)sizeof(buff)),
SEEK_CUR));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt4, sizeof(file_test_txt4) - 1);
@@ -1388,7 +1388,7 @@ DEFINE_TEST(test_read_format_rar_multivolume_seek_multiple_files)
/* Seek to the end minus 64 bytes */
assertA(file_size - (int)sizeof(buff) ==
- archive_seek_data(a, file_size - sizeof(buff), SEEK_SET));
+ archive_seek_data(a, file_size - (int)sizeof(buff), SEEK_SET));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt1, sizeof(file_test_txt1) - 1);
@@ -1398,12 +1398,12 @@ DEFINE_TEST(test_read_format_rar_multivolume_seek_multiple_files)
assertEqualMem(buff, file_test_txt2, sizeof(file_test_txt2) - 1);
/* Seek to the middle of the combined data block */
- assertA(10054 == archive_seek_data(a, 10054 - sizeof(buff), SEEK_CUR));
+ assertA(10054 == archive_seek_data(a, 10054 - (int)sizeof(buff), SEEK_CUR));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt3, sizeof(file_test_txt3) - 1);
/* Seek to 32 bytes before the end of the first data sub-block */
- assertA(969 == archive_seek_data(a, 969 - (10054 + sizeof(buff)), SEEK_CUR));
+ assertA(969 == archive_seek_data(a, 969 - (10054 + (int)sizeof(buff)), SEEK_CUR));
assertA(sizeof(buff) == archive_read_data(a, buff, sizeof(buff)));
assertEqualMem(buff, file_test_txt6, sizeof(file_test_txt4) - 1);