diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-02-09 10:56:05 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-02-09 10:56:05 +0000 |
| commit | bfd7accf016895bfc7c0af369106f52e0ca32e79 (patch) | |
| tree | ea9e0ff2a038ff253d22999a64e6a39cdbe6ac86 /libarchive/test/test_write_format_iso9660_filename.c | |
| parent | 17993d47e9beebea021707962fcdf2387b27cae9 (diff) | |
| download | src-bfd7accf016895bfc7c0af369106f52e0ca32e79.tar.gz src-bfd7accf016895bfc7c0af369106f52e0ca32e79.zip | |
Update libarchive's dist to latest changes in release branch
Git branch: release
Git commit: c477edc817b4382a1d0b2ff8c7b619af13bd349e
Obtained from: https://github.com/libarchive/libarchive.git
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=231270
Diffstat (limited to 'libarchive/test/test_write_format_iso9660_filename.c')
| -rw-r--r-- | libarchive/test/test_write_format_iso9660_filename.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libarchive/test/test_write_format_iso9660_filename.c b/libarchive/test/test_write_format_iso9660_filename.c index 337233e56179..1565af6b37ce 100644 --- a/libarchive/test/test_write_format_iso9660_filename.c +++ b/libarchive/test/test_write_format_iso9660_filename.c @@ -98,13 +98,13 @@ verify_file(struct archive *a, enum vtype type, struct fns *fns) for (i = 0; i < fns->cnt; i++) { const char *p; const char *pathname = archive_entry_pathname(ae); - const char *symlink = archive_entry_symlink(ae); + const char *symlinkname = archive_entry_symlink(ae); size_t length; - if (symlink != NULL) { - length = strlen(symlink); + if (symlinkname != NULL) { + length = strlen(symlinkname); assert(length == 1 || length == 128 || length == 255); - assertEqualInt(symlink[length-1], 'x'); + assertEqualInt(symlinkname[length-1], 'x'); } failure("Found duplicate for %s", pathname); assert(strcmp(fns->names[i], pathname) != 0); @@ -228,11 +228,11 @@ create_iso_image(unsigned char *buff, size_t buffsize, size_t *used, sym1[0] = 'x'; sym1[1] = '\0'; - for (i = 0; i < sizeof(sym128)-2; i++) + for (i = 0; i < (int)sizeof(sym128)-2; i++) sym128[i] = 'a'; sym128[sizeof(sym128)-2] = 'x'; sym128[sizeof(sym128)-1] = '\0'; - for (i = 0; i < sizeof(sym255)-2; i++) + for (i = 0; i < (int)sizeof(sym255)-2; i++) sym255[i] = 'a'; sym255[sizeof(sym255)-2] = 'x'; sym255[sizeof(sym255)-1] = '\0'; |