From: Michihiro NAKAJIMA Date: Thu, 19 May 2011 11:52:15 +0000 (-0400) Subject: Avoid several warnings in libarchive_test on Borland C Compiler. X-Git-Tag: v3.0.0a~317 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f34fe2d5071662f7db4f0308bdf490c41fafa57;p=thirdparty%2Flibarchive.git Avoid several warnings in libarchive_test on Borland C Compiler. SVN-Revision: 3370 --- diff --git a/libarchive/test/main.c b/libarchive/test/main.c index 75b79509a..6fa54ded7 100644 --- a/libarchive/test/main.c +++ b/libarchive/test/main.c @@ -441,7 +441,7 @@ assertion_equal_int(const char *file, int line, static int _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n) { - static unsigned char utf8_count[256] = { + static char utf8_count[256] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 00 - 0F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 10 - 1F */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,/* 20 - 2F */ @@ -460,7 +460,7 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n) 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 /* F0 - FF */ }; int ch; - unsigned char cnt; + int cnt; uint32_t wc; /* Sanity check. */ @@ -475,7 +475,7 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n) cnt = utf8_count[ch]; /* Invalide sequence or there are not plenty bytes. */ - if (n < cnt) + if (n < (size_t)cnt) return (-1); /* Make a Unicode code point from a single UTF-8 sequence. */ diff --git a/libarchive/test/test_compat_mac_gnutar.c b/libarchive/test/test_compat_mac_gnutar.c index b9aa1f711..6ec80d73f 100644 --- a/libarchive/test/test_compat_mac_gnutar.c +++ b/libarchive/test/test_compat_mac_gnutar.c @@ -45,7 +45,6 @@ DEFINE_TEST(test_compat_mac_gnutar) struct archive *a; const void *attr; size_t attrSize; - int r; assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); @@ -53,7 +52,7 @@ DEFINE_TEST(test_compat_mac_gnutar) extract_reference_file(name); assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); - assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString(TESTPATH, archive_entry_pathname(ae)); assertEqualInt(1275688109, archive_entry_mtime(ae)); assertEqualInt(95594, archive_entry_uid(ae)); @@ -66,7 +65,7 @@ DEFINE_TEST(test_compat_mac_gnutar) assert(attr == NULL); assertEqualInt(0, attrSize); - assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString(TESTPATH "dir/", archive_entry_pathname(ae)); assertEqualInt(1275687611, archive_entry_mtime(ae)); assertEqualInt(95594, archive_entry_uid(ae)); @@ -79,7 +78,7 @@ DEFINE_TEST(test_compat_mac_gnutar) assert(attr != NULL); assertEqualInt(225, attrSize); - assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString(TESTPATH "file", archive_entry_pathname(ae)); assertEqualInt(1275687588, archive_entry_mtime(ae)); assertEqualInt(95594, archive_entry_uid(ae)); @@ -92,7 +91,7 @@ DEFINE_TEST(test_compat_mac_gnutar) assert(attr != NULL); assertEqualInt(225, attrSize); - assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("dir/", archive_entry_pathname(ae)); assertEqualInt(1275688064, archive_entry_mtime(ae)); assertEqualInt(95594, archive_entry_uid(ae)); @@ -105,7 +104,7 @@ DEFINE_TEST(test_compat_mac_gnutar) assert(attr != NULL); assertEqualInt(225, attrSize); - assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("file", archive_entry_pathname(ae)); assertEqualInt(1275625860, archive_entry_mtime(ae)); assertEqualInt(95594, archive_entry_uid(ae)); diff --git a/libarchive/test/test_read_truncated_filter.c b/libarchive/test/test_read_truncated_filter.c index 582f7bae4..cb7611ec4 100644 --- a/libarchive/test/test_read_truncated_filter.c +++ b/libarchive/test/test_read_truncated_filter.c @@ -107,7 +107,7 @@ test_truncation(const char *compression, int (*set_compression)(struct archive * } sprintf(path, "%s%d", compression, i); assertEqualString(path, archive_entry_pathname(ae)); - if (datasize != archive_read_data(a, data, datasize)) { + if (datasize != (size_t)archive_read_data(a, data, datasize)) { failure("Should have non-NULL error message for %s", compression); assert(NULL != archive_error_string(a)); diff --git a/libarchive/test/test_sparse_basic.c b/libarchive/test/test_sparse_basic.c index 280a9f70d..000084b54 100644 --- a/libarchive/test/test_sparse_basic.c +++ b/libarchive/test/test_sparse_basic.c @@ -316,6 +316,7 @@ verify_sparse_file2(struct archive *a, const char *path, struct archive_entry *ae; int fd; + (void)sparse; /* UNUSED */ assert((ae = archive_entry_new()) != NULL); archive_entry_set_pathname(ae, path); if (preopen) diff --git a/libarchive/test/test_write_format_xar.c b/libarchive/test/test_write_format_xar.c index d1dd8e310..449e49da1 100644 --- a/libarchive/test/test_write_format_xar.c +++ b/libarchive/test/test_write_format_xar.c @@ -35,7 +35,6 @@ test_xar(const char *option) struct archive_entry *ae; struct archive *a; size_t used; - int i; const char *name; const void *value; size_t size; @@ -182,7 +181,7 @@ test_xar(const char *option) assert((AE_IFREG | 0755) == archive_entry_mode(ae)); assertEqualInt(2, archive_entry_nlink(ae)); assertEqualInt(8, archive_entry_size(ae)); - assertEqualInt(2, i = archive_entry_xattr_reset(ae)); + assertEqualInt(2, archive_entry_xattr_reset(ae)); assertEqualInt(ARCHIVE_OK, archive_entry_xattr_next(ae, &name, &value, &size)); assertEqualString("user.data2", name);