diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-07-27 08:24:12 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-27 08:24:12 +0000 |
| commit | 81418b36c02b6434acd4b8ae4cfb8c80a3742fd4 (patch) | |
| tree | 4b551422581ae9a8093415e07c619e2a59ef6a7b /libarchive/archive_write_set_format_mtree.c | |
| parent | 132160f77407d2174d2bec0a8ba9c6eefc4429d7 (diff) | |
Diffstat (limited to 'libarchive/archive_write_set_format_mtree.c')
| -rw-r--r-- | libarchive/archive_write_set_format_mtree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c index 6b6449cd25ec1..4b300012f7a6e 100644 --- a/libarchive/archive_write_set_format_mtree.c +++ b/libarchive/archive_write_set_format_mtree.c @@ -389,13 +389,13 @@ dir_len(struct mtree_entry *me) else if (*p == '/') al = p - path; } - if (l == -1) + if (l == (size_t)-1) goto alen; size = p - path; rp = p = path; while (*p != '\0') { l = mbtowc(&wc, p, size); - if (l == -1) + if (l == (size_t)-1) goto alen; if (l == 1 && (wc == L'/' || wc == L'\\')) rp = p; @@ -404,7 +404,7 @@ dir_len(struct mtree_entry *me) } return (rp - path + 1); alen: - if (al == -1) + if (al == (size_t)-1) return (0); return (al + 1); } @@ -1079,7 +1079,7 @@ archive_write_mtree_data(struct archive_write *a, const void *buff, size_t n) struct mtree_writer *mtree= a->format_data; if (n > mtree->entry_bytes_remaining) - n = mtree->entry_bytes_remaining; + n = (size_t)mtree->entry_bytes_remaining; mtree->entry_bytes_remaining -= n; /* We don't need to compute a regular file sum */ |