From 802a8c5e7d2a3a1cec65a1766dfbec62ff1ecf93 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 21 Mar 2010 00:03:40 -0400 Subject: [PATCH] archive_read_filter_skip() is only used within archive_read.c, so make it static. SVN-Revision: 2042 --- libarchive/archive_read.c | 7 ++++--- libarchive/archive_read_private.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index 5c99e08f7..5cb3f341b 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -65,6 +65,7 @@ static int _archive_filter_code(struct archive *, int); static const char *_archive_filter_name(struct archive *, int); static int _archive_read_close(struct archive *); static int _archive_read_free(struct archive *); +static int64_t _archive_read_filter_skip(struct archive_read_filter *, int64_t); static struct archive_vtable * archive_read_vtable(void) @@ -1239,11 +1240,11 @@ __archive_read_skip(struct archive_read *a, int64_t request) int64_t __archive_read_skip_lenient(struct archive_read *a, int64_t request) { - return (__archive_read_filter_skip(a->filter, request)); + return (_archive_read_filter_skip(a->filter, request)); } -int64_t -__archive_read_filter_skip(struct archive_read_filter *filter, int64_t request) +static int64_t +_archive_read_filter_skip(struct archive_read_filter *filter, int64_t request) { int64_t bytes_skipped, total_bytes_skipped = 0; size_t min; diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h index fd65aa7a2..2174e893a 100644 --- a/libarchive/archive_read_private.h +++ b/libarchive/archive_read_private.h @@ -212,6 +212,5 @@ ssize_t __archive_read_consume(struct archive_read *, size_t); ssize_t __archive_read_filter_consume(struct archive_read_filter *, size_t); int64_t __archive_read_skip(struct archive_read *, int64_t); int64_t __archive_read_skip_lenient(struct archive_read *, int64_t); -int64_t __archive_read_filter_skip(struct archive_read_filter *, int64_t); int __archive_read_program(struct archive_read_filter *, const char *); #endif -- 2.47.3