[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files/libarchive Merge 70d8540777...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d172ec381114
branches:  trunk
changeset: 359045:d172ec381114
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Feb 25 21:37:47 2017 +0000

description:
Merge 70d85407771c2f89cde9de66a267225dfa18653a from upstream:
Use types consistent with the prototypes in the header.

diffstat:

 archivers/libarchive/files/libarchive/archive_entry.c |  20 +++++++++---------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (93 lines):

diff -r 5b354c55c9bc -r d172ec381114 archivers/libarchive/files/libarchive/archive_entry.c
--- a/archivers/libarchive/files/libarchive/archive_entry.c     Sat Feb 25 21:21:53 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_entry.c     Sat Feb 25 21:37:47 2017 +0000
@@ -401,7 +401,7 @@
        return (NULL);
 }
 
-int64_t
+la_int64_t
 archive_entry_gid(struct archive_entry *entry)
 {
        return (entry->ae_stat.aest_gid);
@@ -502,7 +502,7 @@
        return (archive_mstring_get_mbs_l(&entry->ae_hardlink, p, len, sc));
 }
 
-int64_t
+la_int64_t
 archive_entry_ino(struct archive_entry *entry)
 {
        return (entry->ae_stat.aest_ino);
@@ -514,7 +514,7 @@
        return (entry->ae_set & AE_SET_INO);
 }
 
-int64_t
+la_int64_t
 archive_entry_ino64(struct archive_entry *entry)
 {
        return (entry->ae_stat.aest_ino);
@@ -627,7 +627,7 @@
                return minor(entry->ae_stat.aest_rdev);
 }
 
-int64_t
+la_int64_t
 archive_entry_size(struct archive_entry *entry)
 {
        return (entry->ae_stat.aest_size);
@@ -715,7 +715,7 @@
        return (archive_mstring_get_mbs_l( &entry->ae_symlink, p, len, sc));
 }
 
-int64_t
+la_int64_t
 archive_entry_uid(struct archive_entry *entry)
 {
        return (entry->ae_stat.aest_uid);
@@ -819,7 +819,7 @@
 }
 
 void
-archive_entry_set_gid(struct archive_entry *entry, int64_t g)
+archive_entry_set_gid(struct archive_entry *entry, la_int64_t g)
 {
        entry->stat_valid = 0;
        entry->ae_stat.aest_gid = g;
@@ -868,7 +868,7 @@
 }
 
 void
-archive_entry_set_ino(struct archive_entry *entry, int64_t ino)
+archive_entry_set_ino(struct archive_entry *entry, la_int64_t ino)
 {
        entry->stat_valid = 0;
        entry->ae_set |= AE_SET_INO;
@@ -876,7 +876,7 @@
 }
 
 void
-archive_entry_set_ino64(struct archive_entry *entry, int64_t ino)
+archive_entry_set_ino64(struct archive_entry *entry, la_int64_t ino)
 {
        entry->stat_valid = 0;
        entry->ae_set |= AE_SET_INO;
@@ -1209,7 +1209,7 @@
 }
 
 void
-archive_entry_set_size(struct archive_entry *entry, int64_t s)
+archive_entry_set_size(struct archive_entry *entry, la_int64_t s)
 {
        entry->stat_valid = 0;
        entry->ae_stat.aest_size = s;
@@ -1306,7 +1306,7 @@
 }
 
 void
-archive_entry_set_uid(struct archive_entry *entry, int64_t u)
+archive_entry_set_uid(struct archive_entry *entry, la_int64_t u)
 {
        entry->stat_valid = 0;
        entry->ae_stat.aest_uid = u;