Do not use private macros for special types

When you need to write a callback for archive_read_open2, you must provide a
function which has the same signature as the typedef. The documentation says
that the read callback returns a ssize_t, but on windows there is no such
ssize_t. libarchive falls back on another type and use the private macro
__LA_SSIZE_T, thus it is not possible to write portable code that use
read_open2.

This patch replaces that macro with a simple typedef la_ssize_t (and does the
same for la_int64_t).

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 06bf080f07a0a5e3fa7de0c462b97756d43bf57f..98397a93e3e469e378ab5aa9a8f4fad6f2a36f90 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -48,22 +48,22 @@
 /* Get appropriate definitions of standard POSIX-style types. */
 /* These should match the types used in 'struct stat' */
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
-# define       __LA_INT64_T    __int64
+typedef __int64 la_int64_t;
 # if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
-#  define      __LA_SSIZE_T    ssize_t
+typedef ssize_t la_ssize_t;
 # elif defined(_WIN64)
-#  define      __LA_SSIZE_T    __int64
+typedef __int64 la_ssize_t;
 # else
-#  define      __LA_SSIZE_T    long
+typedef long la_ssize_t;
 # endif
 #else
 # include <unistd.h>  /* ssize_t */
 # if defined(_SCO_DS)
-#  define      __LA_INT64_T    long long
+typedef long long la_int64_t;
 # else
-#  define      __LA_INT64_T    int64_t
+typedef int64_t la_int64_t;
 # endif
-# define       __LA_SSIZE_T    ssize_t
+typedef ssize_t la_ssize_t;
 #endif
 
 /*
@@ -183,7 +183,7 @@ struct archive_entry;
  */
 
 /* Returns pointer and size of next block of data from archive. */
-typedef __LA_SSIZE_T   archive_read_callback(struct archive *,
+typedef la_ssize_t     archive_read_callback(struct archive *,
                            void *_client_data, const void **_buffer);
 
 /* Skips at most request bytes from archive and returns the skipped amount.
@@ -191,18 +191,18 @@ typedef __LA_SSIZE_T      archive_read_callback(struct archive *,
  * If you do skip fewer bytes than requested, libarchive will invoke your
  * read callback and discard data as necessary to make up the full skip.
  */
-typedef __LA_INT64_T   archive_skip_callback(struct archive *,
-                           void *_client_data, __LA_INT64_T request);
+typedef la_int64_t     archive_skip_callback(struct archive *,
+                           void *_client_data, la_int64_t request);
 
 /* Seeks to specified location in the file and returns the position.
  * Whence values are SEEK_SET, SEEK_CUR, SEEK_END from stdio.h.
  * Return ARCHIVE_FATAL if the seek fails for any reason.
  */
-typedef __LA_INT64_T   archive_seek_callback(struct archive *,
-    void *_client_data, __LA_INT64_T offset, int whence);
+typedef la_int64_t     archive_seek_callback(struct archive *,
+    void *_client_data, la_int64_t offset, int whence);
 
 /* Returns size actually written, zero on EOF, -1 on error. */
-typedef __LA_SSIZE_T   archive_write_callback(struct archive *,
+typedef la_ssize_t     archive_write_callback(struct archive *,
                            void *_client_data,
                            const void *_buffer, size_t _length);
 
@@ -517,7 +517,7 @@ __LA_DECL int archive_read_next_header2(struct archive *,
  * Retrieve the byte offset in UNCOMPRESSED data where last-read
  * header started.
  */
-__LA_DECL __LA_INT64_T          archive_read_header_position(struct archive *);
+__LA_DECL la_int64_t            archive_read_header_position(struct archive *);
 
 /*
  * Returns 1 if the archive contains at least one encrypted entry.
@@ -546,11 +546,11 @@ __LA_DECL int     archive_read_has_encrypted_entries(struct archive *);
 __LA_DECL int           archive_read_format_capabilities(struct archive *);
 
 /* Read data from the body of an entry.  Similar to read(2). */
-__LA_DECL __LA_SSIZE_T          archive_read_data(struct archive *,
+__LA_DECL la_ssize_t            archive_read_data(struct archive *,
                                    void *, size_t);
 
 /* Seek within the body of an entry.  Similar to lseek(2). */
-__LA_DECL __LA_INT64_T archive_seek_data(struct archive *, __LA_INT64_T, int);
+__LA_DECL la_int64_t archive_seek_data(struct archive *, la_int64_t, int);
 
 /*
  * A zero-copy version of archive_read_data that also exposes the file offset
@@ -559,7 +559,7 @@ __LA_DECL __LA_INT64_T archive_seek_data(struct archive *, __LA_INT64_T, int);
  * be strictly increasing and that returned blocks will not overlap.
  */
 __LA_DECL int archive_read_data_block(struct archive *a,
-                   const void **buff, size_t *size, __LA_INT64_T *offset);
+                   const void **buff, size_t *size, la_int64_t *offset);
 
 /*-
  * Some convenience functions that are built on archive_read_data:
@@ -662,7 +662,7 @@ __LA_DECL void       archive_read_extract_set_progress_callback(struct archive *,
 /* Record the dev/ino of a file that will not be written.  This is
  * generally set to the dev/ino of the archive being read. */
 __LA_DECL void         archive_read_extract_set_skip_file(struct archive *,
-                    __LA_INT64_T, __LA_INT64_T);
+                    la_int64_t, la_int64_t);
 
 /* Close the file and release most resources. */
 __LA_DECL int           archive_read_close(struct archive *);
@@ -701,7 +701,7 @@ __LA_DECL int archive_write_get_bytes_in_last_block(struct archive *);
 /* The dev/ino of a file that won't be archived.  This is used
  * to avoid recursively adding an archive to itself. */
 __LA_DECL int archive_write_set_skip_file(struct archive *,
-    __LA_INT64_T, __LA_INT64_T);
+    la_int64_t, la_int64_t);
 
 #if ARCHIVE_VERSION_NUMBER < 4000000
 __LA_DECL int archive_write_set_compression_bzip2(struct archive *)
@@ -794,12 +794,12 @@ __LA_DECL int archive_write_open_memory(struct archive *,
  */
 __LA_DECL int archive_write_header(struct archive *,
                     struct archive_entry *);
-__LA_DECL __LA_SSIZE_T archive_write_data(struct archive *,
+__LA_DECL la_ssize_t   archive_write_data(struct archive *,
                            const void *, size_t);
 
 /* This interface is currently only available for archive_write_disk handles.  */
-__LA_DECL __LA_SSIZE_T  archive_write_data_block(struct archive *,
-                                   const void *, size_t, __LA_INT64_T);
+__LA_DECL la_ssize_t    archive_write_data_block(struct archive *,
+                                   const void *, size_t, la_int64_t);
 
 __LA_DECL int           archive_write_finish_entry(struct archive *);
 __LA_DECL int           archive_write_close(struct archive *);
@@ -860,7 +860,7 @@ __LA_DECL int archive_write_set_passphrase_callback(struct archive *,
 __LA_DECL struct archive       *archive_write_disk_new(void);
 /* This file will not be overwritten. */
 __LA_DECL int archive_write_disk_set_skip_file(struct archive *,
-    __LA_INT64_T, __LA_INT64_T);
+    la_int64_t, la_int64_t);
 /* Set flags to control how the next item gets created.
  * This accepts a bitmask of ARCHIVE_EXTRACT_XXX flags defined above. */
 __LA_DECL int           archive_write_disk_set_options(struct archive *,
@@ -890,14 +890,14 @@ __LA_DECL int      archive_write_disk_set_standard_lookup(struct archive *);
  */
 __LA_DECL int archive_write_disk_set_group_lookup(struct archive *,
     void * /* private_data */,
-    __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
+    la_int64_t (*)(void *, const char *, la_int64_t),
     void (* /* cleanup */)(void *));
 __LA_DECL int archive_write_disk_set_user_lookup(struct archive *,
     void * /* private_data */,
-    __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
+    la_int64_t (*)(void *, const char *, la_int64_t),
     void (* /* cleanup */)(void *));
-__LA_DECL __LA_INT64_T archive_write_disk_gid(struct archive *, const char *, __LA_INT64_T);
-__LA_DECL __LA_INT64_T archive_write_disk_uid(struct archive *, const char *, __LA_INT64_T);
+__LA_DECL la_int64_t archive_write_disk_gid(struct archive *, const char *, la_int64_t);
+__LA_DECL la_int64_t archive_write_disk_uid(struct archive *, const char *, la_int64_t);
 
 /*
  * ARCHIVE_READ_DISK API
@@ -918,19 +918,19 @@ __LA_DECL int archive_read_disk_entry_from_file(struct archive *,
     struct archive_entry *, int /* fd */, const struct stat *);
 /* Look up gname for gid or uname for uid. */
 /* Default implementations are very, very stupid. */
-__LA_DECL const char *archive_read_disk_gname(struct archive *, __LA_INT64_T);
-__LA_DECL const char *archive_read_disk_uname(struct archive *, __LA_INT64_T);
+__LA_DECL const char *archive_read_disk_gname(struct archive *, la_int64_t);
+__LA_DECL const char *archive_read_disk_uname(struct archive *, la_int64_t);
 /* "Standard" implementation uses getpwuid_r, getgrgid_r and caches the
  * results for performance. */
 __LA_DECL int  archive_read_disk_set_standard_lookup(struct archive *);
 /* You can install your own lookups if you like. */
 __LA_DECL int  archive_read_disk_set_gname_lookup(struct archive *,
     void * /* private_data */,
-    const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
+    const char *(* /* lookup_fn */)(void *, la_int64_t),
     void (* /* cleanup_fn */)(void *));
 __LA_DECL int  archive_read_disk_set_uname_lookup(struct archive *,
     void * /* private_data */,
-    const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
+    const char *(* /* lookup_fn */)(void *, la_int64_t),
     void (* /* cleanup_fn */)(void *));
 /* Start traversal. */
 __LA_DECL int  archive_read_disk_open(struct archive *, const char *);
@@ -996,7 +996,7 @@ __LA_DECL int       archive_free(struct archive *);
  * last filter, which is always the pseudo-filter that wraps the
  * client callbacks. */
 __LA_DECL int           archive_filter_count(struct archive *);
-__LA_DECL __LA_INT64_T  archive_filter_bytes(struct archive *, int);
+__LA_DECL la_int64_t    archive_filter_bytes(struct archive *, int);
 __LA_DECL int           archive_filter_code(struct archive *, int);
 __LA_DECL const char *  archive_filter_name(struct archive *, int);
 
@@ -1004,10 +1004,10 @@ __LA_DECL const char *   archive_filter_name(struct archive *, int);
 /* These don't properly handle multiple filters, so are deprecated and
  * will eventually be removed. */
 /* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, -1); */
-__LA_DECL __LA_INT64_T  archive_position_compressed(struct archive *)
+__LA_DECL la_int64_t    archive_position_compressed(struct archive *)
                                __LA_DEPRECATED;
 /* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, 0); */
-__LA_DECL __LA_INT64_T  archive_position_uncompressed(struct archive *)
+__LA_DECL la_int64_t    archive_position_uncompressed(struct archive *)
                                __LA_DEPRECATED;
 /* As of libarchive 3.0, this is an alias for archive_filter_name(a, 0); */
 __LA_DECL const char   *archive_compression_name(struct archive *)
@@ -1123,8 +1123,8 @@ __LA_DECL int     archive_match_exclude_entry(struct archive *,
 __LA_DECL int  archive_match_owner_excluded(struct archive *,
                    struct archive_entry *);
 /* Add inclusion uid, gid, uname and gname. */
-__LA_DECL int  archive_match_include_uid(struct archive *, __LA_INT64_T);
-__LA_DECL int  archive_match_include_gid(struct archive *, __LA_INT64_T);
+__LA_DECL int  archive_match_include_uid(struct archive *, la_int64_t);
+__LA_DECL int  archive_match_include_gid(struct archive *, la_int64_t);
 __LA_DECL int  archive_match_include_uname(struct archive *, const char *);
 __LA_DECL int  archive_match_include_uname_w(struct archive *,
                    const wchar_t *);
@@ -1143,9 +1143,4 @@ __LA_DECL int archive_utility_string_sort(char **);
 /* These are meaningless outside of this header. */
 #undef __LA_DECL
 
-/* These need to remain defined because they're used in the
- * callback type definitions.  XXX Fix this.  This is ugly. XXX */
-/* #undef __LA_INT64_T */
-/* #undef __LA_SSIZE_T */
-
 #endif /* !ARCHIVE_H_INCLUDED */

diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index 9f7fafecd4cb90adb952751070ec663622cacfca..b42fad6d5c278704d13b3cef8d6e59e6a293c8da 100644 (file)
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -49,13 +49,13 @@
 
 /* Get a suitable 64-bit integer type. */
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
-# define       __LA_INT64_T    __int64
+typedef __int64 la_int64_t;
 #else
 #include <unistd.h>
 # if defined(_SCO_DS)
-#  define      __LA_INT64_T    long long
+typedef long long la_int64_t;
 # else
-#  define      __LA_INT64_T    int64_t
+typedef int64_t la_int64_t;
 # endif
 #endif
 
@@ -206,15 +206,15 @@ __LA_DECL void             archive_entry_fflags(struct archive_entry *,
                            unsigned long * /* set */,
                            unsigned long * /* clear */);
 __LA_DECL const char   *archive_entry_fflags_text(struct archive_entry *);
-__LA_DECL __LA_INT64_T  archive_entry_gid(struct archive_entry *);
+__LA_DECL la_int64_t    archive_entry_gid(struct archive_entry *);
 __LA_DECL const char   *archive_entry_gname(struct archive_entry *);
 __LA_DECL const char   *archive_entry_gname_utf8(struct archive_entry *);
 __LA_DECL const wchar_t        *archive_entry_gname_w(struct archive_entry *);
 __LA_DECL const char   *archive_entry_hardlink(struct archive_entry *);
 __LA_DECL const char   *archive_entry_hardlink_utf8(struct archive_entry *);
 __LA_DECL const wchar_t        *archive_entry_hardlink_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T  archive_entry_ino(struct archive_entry *);
-__LA_DECL __LA_INT64_T  archive_entry_ino64(struct archive_entry *);
+__LA_DECL la_int64_t    archive_entry_ino(struct archive_entry *);
+__LA_DECL la_int64_t    archive_entry_ino64(struct archive_entry *);
 __LA_DECL int           archive_entry_ino_is_set(struct archive_entry *);
 __LA_DECL __LA_MODE_T   archive_entry_mode(struct archive_entry *);
 __LA_DECL time_t        archive_entry_mtime(struct archive_entry *);
@@ -230,13 +230,13 @@ __LA_DECL dev_t            archive_entry_rdevmajor(struct archive_entry *);
 __LA_DECL dev_t                 archive_entry_rdevminor(struct archive_entry *);
 __LA_DECL const char   *archive_entry_sourcepath(struct archive_entry *);
 __LA_DECL const wchar_t        *archive_entry_sourcepath_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T  archive_entry_size(struct archive_entry *);
+__LA_DECL la_int64_t    archive_entry_size(struct archive_entry *);
 __LA_DECL int           archive_entry_size_is_set(struct archive_entry *);
 __LA_DECL const char   *archive_entry_strmode(struct archive_entry *);
 __LA_DECL const char   *archive_entry_symlink(struct archive_entry *);
 __LA_DECL const char   *archive_entry_symlink_utf8(struct archive_entry *);
 __LA_DECL const wchar_t        *archive_entry_symlink_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T  archive_entry_uid(struct archive_entry *);
+__LA_DECL la_int64_t    archive_entry_uid(struct archive_entry *);
 __LA_DECL const char   *archive_entry_uname(struct archive_entry *);
 __LA_DECL const char   *archive_entry_uname_utf8(struct archive_entry *);
 __LA_DECL const wchar_t        *archive_entry_uname_w(struct archive_entry *);
@@ -274,7 +274,7 @@ __LA_DECL const char *archive_entry_copy_fflags_text(struct archive_entry *,
            const char *);
 __LA_DECL const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *,
            const wchar_t *);
-__LA_DECL void archive_entry_set_gid(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void archive_entry_set_gid(struct archive_entry *, la_int64_t);
 __LA_DECL void archive_entry_set_gname(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_set_gname_utf8(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_copy_gname(struct archive_entry *, const char *);
@@ -285,8 +285,8 @@ __LA_DECL void      archive_entry_set_hardlink_utf8(struct archive_entry *, const cha
 __LA_DECL void archive_entry_copy_hardlink(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int  archive_entry_update_hardlink_utf8(struct archive_entry *, const char *);
-__LA_DECL void archive_entry_set_ino(struct archive_entry *, __LA_INT64_T);
-__LA_DECL void archive_entry_set_ino64(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void archive_entry_set_ino(struct archive_entry *, la_int64_t);
+__LA_DECL void archive_entry_set_ino64(struct archive_entry *, la_int64_t);
 __LA_DECL void archive_entry_set_link(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_set_link_utf8(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_copy_link(struct archive_entry *, const char *);
@@ -305,7 +305,7 @@ __LA_DECL void      archive_entry_set_perm(struct archive_entry *, __LA_MODE_T);
 __LA_DECL void archive_entry_set_rdev(struct archive_entry *, dev_t);
 __LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
 __LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, dev_t);
-__LA_DECL void archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void archive_entry_set_size(struct archive_entry *, la_int64_t);
 __LA_DECL void archive_entry_unset_size(struct archive_entry *);
 __LA_DECL void archive_entry_copy_sourcepath(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_copy_sourcepath_w(struct archive_entry *, const wchar_t *);
@@ -314,7 +314,7 @@ __LA_DECL void      archive_entry_set_symlink_utf8(struct archive_entry *, const char
 __LA_DECL void archive_entry_copy_symlink(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *);
 __LA_DECL int  archive_entry_update_symlink_utf8(struct archive_entry *, const char *);
-__LA_DECL void archive_entry_set_uid(struct archive_entry *, __LA_INT64_T);
+__LA_DECL void archive_entry_set_uid(struct archive_entry *, la_int64_t);
 __LA_DECL void archive_entry_set_uname(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_set_uname_utf8(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_copy_uname(struct archive_entry *, const char *);
@@ -530,7 +530,7 @@ __LA_DECL int       archive_entry_xattr_next(struct archive_entry *,
 
 __LA_DECL void  archive_entry_sparse_clear(struct archive_entry *);
 __LA_DECL void  archive_entry_sparse_add_entry(struct archive_entry *,
-           __LA_INT64_T /* offset */, __LA_INT64_T /* length */);
+           la_int64_t /* offset */, la_int64_t /* length */);
 
 /*
  * To retrieve the xattr list, first "reset", then repeatedly ask for the
@@ -540,7 +540,7 @@ __LA_DECL void       archive_entry_sparse_add_entry(struct archive_entry *,
 __LA_DECL int  archive_entry_sparse_count(struct archive_entry *);
 __LA_DECL int  archive_entry_sparse_reset(struct archive_entry *);
 __LA_DECL int  archive_entry_sparse_next(struct archive_entry *,
-           __LA_INT64_T * /* offset */, __LA_INT64_T * /* length */);
+           la_int64_t * /* offset */, la_int64_t * /* length */);
 
 /*
  * Utility to match up hardlinks.

diff --git a/libarchive/archive_read.3 b/libarchive/archive_read.3
index e0b420964a20b6091665eac6315a35841c1c1977..d37e7327cb5e6e39d9593dc611d616b831ec07d3 100644 (file)
--- a/libarchive/archive_read.3
+++ b/libarchive/archive_read.3
@@ -186,7 +186,7 @@ list_archive(const char *name)
   free(mydata);
 }
 
-ssize_t
+la_ssize_t
 myread(struct archive *a, void *client_data, const void **buff)
 {
   struct mydata *mydata = client_data;

diff --git a/libarchive/archive_read_data.3 b/libarchive/archive_read_data.3
index bf0578ce37794f299c23c361f9e7e1c6f36c9d02..c1bc15d7cc8c26afc7c0c4bc8804cd2bc4923f98 100644 (file)
--- a/libarchive/archive_read_data.3
+++ b/libarchive/archive_read_data.3
@@ -37,7 +37,7 @@
 Streaming Archive Library (libarchive, -larchive)
 .Sh SYNOPSIS
 .In archive.h
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_read_data "struct archive *" "void *buff" "size_t len"
 .Ft int
 .Fo archive_read_data_block

diff --git a/libarchive/archive_read_open.3 b/libarchive/archive_read_open.3
index 30a740bef13fcb769cbc6400fe386da2ebc3d8de..4d8272cac87362ae3ed3e01fb9827c00a3aba209 100644 (file)
--- a/libarchive/archive_read_open.3
+++ b/libarchive/archive_read_open.3
@@ -130,14 +130,14 @@ objects can be found in the overview manual page for
 The callback functions must match the following prototypes:
 .Bl -item -offset indent
 .It
-.Ft typedef ssize_t
+.Ft typedef la_ssize_t
 .Fo archive_read_callback
 .Fa "struct archive *"
 .Fa "void *client_data"
 .Fa "const void **buffer"
 .Fc
 .It
-.Ft typedef off_t
+.Ft typedef la_int64_t
 .Fo archive_skip_callback
 .Fa "struct archive *"
 .Fa "void *client_data"

diff --git a/libarchive/archive_write.3 b/libarchive/archive_write.3
index aefda3be8c908b1b48578977bc65eda40944f1b0..376d71dee20e3d86bce1f183a3dac03953c9fc1c 100644 (file)
--- a/libarchive/archive_write.3
+++ b/libarchive/archive_write.3
@@ -155,7 +155,7 @@ myopen(struct archive *a, void *client_data)
     return (ARCHIVE_FATAL);
 }
 
-ssize_t
+la_ssize_t
 mywrite(struct archive *a, void *client_data, const void *buff, size_t n)
 {
   struct mydata *mydata = client_data;

diff --git a/libarchive/archive_write_data.3 b/libarchive/archive_write_data.3
index a85f61d3a4d36a6b04d0e9144008a673189da4d9..0cdd25f1f9233caabde425c6378814468209f1b1 100644 (file)
--- a/libarchive/archive_write_data.3
+++ b/libarchive/archive_write_data.3
@@ -34,7 +34,7 @@
 Streaming Archive Library (libarchive, -larchive)
 .Sh SYNOPSIS
 .In archive.h
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_write_data "struct archive *" "const void *" "size_t"
 .Sh DESCRIPTION
 Write data corresponding to the header just written.

diff --git a/libarchive/archive_write_disk.3 b/libarchive/archive_write_disk.3
index a2e7afaa06d8909ab28ebda6f4058b61c707e43c..1193929903862c6b3875411e197da4579061f6d0 100644 (file)
--- a/libarchive/archive_write_disk.3
+++ b/libarchive/archive_write_disk.3
@@ -70,9 +70,9 @@ Streaming Archive Library (libarchive, -larchive)
 .Fc
 .Ft int
 .Fn archive_write_header "struct archive *" "struct archive_entry *"
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_write_data "struct archive *" "const void *" "size_t"
-.Ft ssize_t
+.Ft la_ssize_t
 .Fn archive_write_data_block "struct archive *" "const void *" "size_t size" "int64_t offset"
 .Ft int
 .Fn archive_write_finish_entry "struct archive *"

diff --git a/libarchive/archive_write_open.3 b/libarchive/archive_write_open.3
index 4037248e0e04732a49e4aa842cadd064cb166d30..a52959b98fcbb027fff99577321658705be29894 100644 (file)
--- a/libarchive/archive_write_open.3
+++ b/libarchive/archive_write_open.3
@@ -154,7 +154,7 @@ to register an error code and message and return
 .Cm ARCHIVE_FATAL .
 .Bl -item -offset indent
 .It
-.Ft typedef ssize_t
+.Ft typedef la_ssize_t
 .Fo archive_write_callback
 .Fa "struct archive *"
 .Fa "void *client_data"