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 56d1ccbccc1797fd344d611d7ea3bc9de6bbb597..adec9b265643d9e4431b4393d6a8a49783837c80 100644 (file)
--- 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 ca96d39aab561cc9f38abb962012a998cc525cd5..f4162eb4bb49507d731936d6660a01ca2a107ded 100644 (file)
--- 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;