archive_read_filter_skip() is only used within archive_read.c,

so make it static.

SVN-Revision: 2042

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 5c99e08f76410148b7583d36db947c29a469d138..5cb3f341bce4b762fb046511d74b49d915bf2f0b 100644 (file)
--- 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 fd65aa7a2c64e80694a8ef4868f45cbe4196af28..2174e893a5d0bf573eb7de9f4fd7aa198d300f43 100644 (file)
--- 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