Test harness should use 'const' buffer here

diff --git a/libarchive/test/read_open_memory.c b/libarchive/test/read_open_memory.c
index 0bf6f754f6d95b754777d6e849e526610fee5190..ca96d39aab561cc9f38abb962012a998cc525cd5 100644 (file)
--- a/libarchive/test/read_open_memory.c
+++ b/libarchive/test/read_open_memory.c
@@ -39,9 +39,9 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/read_open_memory.c 191183 2009-04-1
  */
 
 struct read_memory_data {
-       unsigned char   *start;
-       unsigned char   *p;
-       unsigned char   *end;
+       const unsigned char     *start;
+       const unsigned char     *p;
+       const unsigned char     *end;
        size_t   read_size;
        size_t copy_buff_size;
        size_t copy_buff_offset;
@@ -53,12 +53,12 @@ static int  memory_read_open(struct archive *, void *);
 static int64_t memory_read_seek(struct archive *, void *, int64_t request, int whence);
 static int64_t memory_read_skip(struct archive *, void *, int64_t request);
 static ssize_t memory_read(struct archive *, void *, const void **buff);
-static int     read_open_memory_internal(struct archive *a, void *buff,
+static int     read_open_memory_internal(struct archive *a, const void *buff,
     size_t size, size_t read_size, int fullapi);
 
 
 int
-read_open_memory(struct archive *a, void *buff, size_t size, size_t read_size)
+read_open_memory(struct archive *a, const void *buff, size_t size, size_t read_size)
 {
        return read_open_memory_internal(a, buff, size, read_size, 2);
 }
@@ -68,7 +68,7 @@ read_open_memory(struct archive *a, void *buff, size_t size, size_t read_size)
  * that internals work correctly with just the minimal entry points.
  */
 int
-read_open_memory_minimal(struct archive *a, void *buff, size_t size, size_t read_size)
+read_open_memory_minimal(struct archive *a, const void *buff, size_t size, size_t read_size)
 {
        return read_open_memory_internal(a, buff, size, read_size, 1);
 }
@@ -77,13 +77,13 @@ read_open_memory_minimal(struct archive *a, void *buff, size_t size, size_t read
  * Include a seek callback as well.
  */
 int
-read_open_memory_seek(struct archive *a, void *buff, size_t size, size_t read_size)
+read_open_memory_seek(struct archive *a, const void *buff, size_t size, size_t read_size)
 {
        return read_open_memory_internal(a, buff, size, read_size, 3);
 }
 
 static int
-read_open_memory_internal(struct archive *a, void *buff,
+read_open_memory_internal(struct archive *a, const void *buff,
     size_t size, size_t read_size, int level)
 {
        struct read_memory_data *mine;

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index 73e16eaf907438a92537ddf29cd7e974fcfeda0c..f80565bc1b408d4accd376f5cf4455ace8c0474f 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -330,11 +330,11 @@ extern const char *testworkdir;
 #include "archive_entry.h"
 
 /* Special customized read-from-memory interface. */
-int read_open_memory(struct archive *, void *, size_t, size_t);
+int read_open_memory(struct archive *, const void *, size_t, size_t);
 /* _minimal version exercises a slightly different set of libarchive APIs. */
-int read_open_memory_minimal(struct archive *, void *, size_t, size_t);
+int read_open_memory_minimal(struct archive *, const void *, size_t, size_t);
 /* _seek version produces a seekable file. */
-int read_open_memory_seek(struct archive *, void *, size_t, size_t);
+int read_open_memory_seek(struct archive *, const void *, size_t, size_t);
 
 /* Versions of above that accept an archive argument for additional info. */
 #define assertA(e)   assertion_assert(__FILE__, __LINE__, (e), #e, (a))