From: Paul Harris Date: Tue, 23 Jun 2015 07:06:17 +0000 (+0800) Subject: Fix a few compile warnings (g++ 4.7.2) X-Git-Tag: v3.1.900a~88^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F562%2Fhead;p=thirdparty%2Flibarchive.git Fix a few compile warnings (g++ 4.7.2) --- diff --git a/libarchive/archive_write_set_format_filter_by_ext.c b/libarchive/archive_write_set_format_filter_by_ext.c index 56d1ccbcc..adec9b265 100644 --- a/libarchive/archive_write_set_format_filter_by_ext.c +++ b/libarchive/archive_write_set_format_filter_by_ext.c @@ -83,7 +83,7 @@ int cmpsuff(const char *str, const char *suffix) } } -int get_array_index(const char *name) +static int get_array_index(const char *name) { int i; diff --git a/libarchive/test/read_open_memory.c b/libarchive/test/read_open_memory.c index ca96d39aa..f4162eb4b 100644 --- a/libarchive/test/read_open_memory.c +++ b/libarchive/test/read_open_memory.c @@ -94,7 +94,7 @@ read_open_memory_internal(struct archive *a, const void *buff, return (ARCHIVE_FATAL); } memset(mine, 0, sizeof(*mine)); - mine->start = mine->p = (unsigned char *)buff; + mine->start = mine->p = (const unsigned char *)buff; mine->end = mine->start + size; mine->read_size = read_size; mine->copy_buff_offset = 32;