Be consistent about la_ssize_t and ssize_t (#1010).

diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
index 30fb4566eb9a7a20ac45e4c386ac817aa6262785..f722bbe85c74f4b197de182d2a87e11805a01bbe 100644 (file)
--- a/libarchive/archive_entry.c
+++ b/libarchive/archive_entry.c
@@ -1491,7 +1491,7 @@ archive_entry_acl_next(struct archive_entry *entry, int want_type, int *type,
  * the style of the generated ACL.
  */
 wchar_t *
-archive_entry_acl_to_text_w(struct archive_entry *entry, ssize_t *len,
+archive_entry_acl_to_text_w(struct archive_entry *entry, la_ssize_t *len,
     int flags)
 {
        return (archive_acl_to_text_w(&entry->acl, len, flags,
@@ -1499,7 +1499,7 @@ archive_entry_acl_to_text_w(struct archive_entry *entry, ssize_t *len,
 }
 
 char *
-archive_entry_acl_to_text(struct archive_entry *entry, ssize_t *len,
+archive_entry_acl_to_text(struct archive_entry *entry, la_ssize_t *len,
     int flags)
 {
        return (archive_acl_to_text_l(&entry->acl, len, flags, NULL));

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 0f5fd1f68c925b0253baf0d8076c6c886ef15496..0e56e76e73159b515481cfcacc4fa709e2631824 100644 (file)
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -821,7 +821,7 @@ archive_read_format_capabilities(struct archive *_a)
  * DO NOT intermingle calls to this function and archive_read_data_block
  * to read a single entry body.
  */
-ssize_t
+la_ssize_t
 archive_read_data(struct archive *_a, void *buff, size_t s)
 {
        struct archive *a = (struct archive *)_a;

diff --git a/libarchive/archive_virtual.c b/libarchive/archive_virtual.c
index 37ba4b69c931d84619475df8b849117ce11a5e91..f509ee5c672d6af4b8fd3f7c9a3d3ddd95df00aa 100644 (file)
--- a/libarchive/archive_virtual.c
+++ b/libarchive/archive_virtual.c
@@ -124,13 +124,13 @@ archive_write_finish_entry(struct archive *a)
        return ((a->vtable->archive_write_finish_entry)(a));
 }
 
-ssize_t
+la_ssize_t
 archive_write_data(struct archive *a, const void *buff, size_t s)
 {
        return ((a->vtable->archive_write_data)(a, buff, s));
 }
 
-ssize_t
+la_ssize_t
 archive_write_data_block(struct archive *a, const void *buff, size_t s,
     la_int64_t o)
 {