diff options
| author | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-04-09 04:07:11 -0400 |
|---|---|---|
| committer | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-04-09 04:07:11 -0400 |
| commit | a653ac9409f190796a1f02f4d2200031e10102d7 (patch) | |
| tree | 360a5950071c4017afef581a9efb6ae51a8d4086 /libarchive/archive_read_disk_set_standard_lookup.c | |
| parent | ff35fb2d7e267908344f33389694d5764b2a06cd (diff) | |
| download | libarchive-a653ac9409f190796a1f02f4d2200031e10102d7.tar.gz | |
remove stuff covered by #if ARCHIVE_VERSION_NUMBER < 3000000
archive.h says #define ARCHIVE_VERSION_NUMBER 3000000, and it's
not going to decrease.
SVN-Revision: 3191
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, 0 insertions, 15 deletions
diff --git a/libarchive/archive_read_disk_set_standard_lookup.c b/libarchive/archive_read_disk_set_standard_lookup.c index c302b98d..7e9a671c 100644 --- a/libarchive/archive_read_disk_set_standard_lookup.c +++ b/libarchive/archive_read_disk_set_standard_lookup.c @@ -72,13 +72,8 @@ 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); @@ -179,13 +174,8 @@ 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, @@ -248,13 +238,8 @@ lookup_uname_helper(struct name_cache *cache, id_t id) } #endif -#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, |