Module Name: src
Committed By: drochner
Date: Tue Jul 12 18:19:13 UTC 2011
Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive.h
archive_read_support_format_iso9660.c archive_write_disk.c
archive_write_set_format_ar.c archive_write_set_format_ustar.c
Log Message:
minor printf format fixes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c
\
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c \
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive.h
diff -u src/external/bsd/libarchive/dist/libarchive/archive.h:1.1.1.4 src/external/bsd/libarchive/dist/libarchive/archive.h:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive.h:1.1.1.4 Wed Jul 14 22:10:45 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive.h Tue Jul 12 18:19:13 2011
@@ -719,7 +719,8 @@
__LA_DECL int archive_format(struct archive *);
__LA_DECL void archive_clear_error(struct archive *);
__LA_DECL void archive_set_error(struct archive *, int _err,
- const char *fmt, ...);
+ const char *fmt, ...)
+ __attribute__((__format__(__printf__,3,4)));
__LA_DECL void archive_copy_error(struct archive *dest,
struct archive *src);
__LA_DECL int archive_file_count(struct archive *);
Index: src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c:1.1.1.2 Sat Feb 20 02:48:33 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c Tue Jul 12 18:19:13 2011
@@ -919,7 +919,7 @@
if (parent->offset + parent->size > iso9660->volume_size) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
"Directory is beyond end-of-media: %s",
- parent->name);
+ parent->name.s);
return (ARCHIVE_WARN);
}
if (iso9660->current_position < parent->offset) {
@@ -1215,7 +1215,7 @@
if (file->offset + file->size > iso9660->volume_size) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "File is beyond end-of-media: %s", file->name);
+ "File is beyond end-of-media: %s", file->name.s);
iso9660->entry_bytes_remaining = 0;
iso9660->entry_sparse_offset = 0;
return (ARCHIVE_WARN);
@@ -1274,7 +1274,7 @@
if ((file->mode & AE_IFMT) != AE_IFDIR &&
file->offset < iso9660->current_position) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Ignoring out-of-order file @%x (%s) %jd < %jd",
+ "Ignoring out-of-order file @%p (%s) %jd < %jd",
file,
iso9660->pathname.s,
file->offset, iso9660->current_position);
Index: src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c:1.1.1.2 Sat Feb 20 02:48:39 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c Tue Jul 12 18:19:13 2011
@@ -439,8 +439,8 @@
if (ar->entry_padding != 1) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Padding wrong size: %d should be 1 or 0",
- ar->entry_padding);
+ "Padding wrong size: %lld should be 1 or 0",
+ (long long)ar->entry_padding);
return (ARCHIVE_WARN);
}
Index: src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c:1.1.1.2 Sat Feb 20 02:48:41 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c Tue Jul 12 18:19:13 2011
@@ -168,7 +168,7 @@
/* Basic internal sanity test. */
if (sizeof(template_header) != 512) {
- archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Internal: template_header wrong size: %d should be 512", sizeof(template_header));
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Internal: template_header wrong size: %zd should be 512", sizeof(template_header));
return (ARCHIVE_FATAL);
}
Index: src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c:1.1.1.3 src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c:1.1.1.3 Wed Jul 14 22:10:59 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c Tue Jul 12 18:19:13 2011
@@ -1729,7 +1729,6 @@
}
if (unlink(path) != 0) {
archive_set_error(&a->archive, errno,
- "Can't create directory '%s': "
"Conflicting file cannot be removed");
return (ARCHIVE_FAILED);
}
