From: Joerg Sonnenberger <joerg@bec.de>
Date: Thu, 19 Jul 2018 13:54:45 +0000 (+0200)
Subject: Be consistent about la_ssize_t and ssize_t (#1010).
X-Git-Tag: v3.3.3~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=321bc20f2e1fe46dec66bd432793f25fc8d15be2;p=thirdparty%2Flibarchive.git

Be consistent about la_ssize_t and ssize_t (#1010).
---

diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
index 30fb4566e..f722bbe85 100644
--- 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 0f5fd1f68..0e56e76e7 100644
--- 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 37ba4b69c..f509ee5c6 100644
--- 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)
 {