diff options
| author | Tim Kientzle <kientzle@gmail.com> | 2010-02-21 15:33:51 -0500 |
|---|---|---|
| committer | Tim Kientzle <kientzle@gmail.com> | 2010-02-21 15:33:51 -0500 |
| commit | 73f39d903cd3f34d24c1227caad6f07a8263f9c8 (patch) | |
| tree | 45118c7fe98c02716791a4fbf1297346f3d2f352 /libarchive/archive_read_disk_set_standard_lookup.c | |
| parent | 8e8b44687a1ce84790f6e3de6c752f501c08054f (diff) | |
| download | libarchive-73f39d903cd3f34d24c1227caad6f07a8263f9c8.tar.gz | |
Prepare for the 3.0 ABI by switching a bunch of uses of off_t, dev_t,
ino_t, uid_t, and gid_t to use int64_t instead. These are all
conditional on ARCHIVE_VERSION_NUMBER >= 3000000 so we still have the
option of cutting a 2.9 release with the old ABI.
SVN-Revision: 1945
Diffstat (limited to 'libarchive/archive_read_disk_set_standard_lookup.c')
| -rw-r--r-- | libarchive/archive_read_disk_set_standard_lookup.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libarchive/archive_read_disk_set_standard_lookup.c b/libarchive/archive_read_disk_set_standard_lookup.c index 94f4a308..ceaf0cf2 100644 --- a/libarchive/archive_read_disk_set_standard_lookup.c +++ b/libarchive/archive_read_disk_set_standard_lookup.c @@ -72,8 +72,13 @@ struct name_cache { } cache[name_cache_size]; }; +#if ARCHIVE_VERSION_NUMBER < 3000000 static const char * lookup_gname(void *, gid_t); static const char * lookup_uname(void *, uid_t); +#else +static const char * lookup_gname(void *, int64_t); +static const char * lookup_uname(void *, int64_t); +#endif static void cleanup(void *); static const char * lookup_gname_helper(struct name_cache *, id_t gid); static const char * lookup_uname_helper(struct name_cache *, id_t uid); @@ -174,8 +179,13 @@ lookup_name(struct name_cache *cache, return (cache->cache[slot].name); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static const char * lookup_uname(void *data, uid_t uid) +#else +static const char * +lookup_uname(void *data, int64_t uid) +#endif { struct name_cache *uname_cache = (struct name_cache *)data; return (lookup_name(uname_cache, @@ -223,8 +233,13 @@ lookup_uname_helper(struct name_cache *cache, id_t id) return strdup(result->pw_name); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static const char * lookup_gname(void *data, gid_t gid) +#else +static const char * +lookup_gname(void *data, int64_t gid) +#endif { struct name_cache *gname_cache = (struct name_cache *)data; return (lookup_name(gname_cache, |