Module Name: src
Committed By: christos
Date: Fri Jan 17 00:37:26 UTC 2020
Modified Files:
src/external/bsd/libarchive/dist/libarchive/test:
test_archive_write_set_format_filter_by_ext.c
test_read_format_7zip.c test_sparse_basic.c
test_write_format_zip_file.c test_write_format_zip_file_zip64.c
Log Message:
make things compile (pullup merged)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c
diff -u src/external/bsd/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c:1.1.1.1 Thu Apr 20 08:55:56 2017
+++ src/external/bsd/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c Thu Jan 16 19:37:26 2020
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
static void
test_format_filter_by_ext(const char *output_file,
- int format_id, int filter_id, int dot_stored, char * def_ext)
+ int format_id, int filter_id, int dot_stored, const char * def_ext)
{
struct archive_entry *ae;
struct archive *a;
Index: src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c
diff -u src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c:1.1.1.1 Thu Apr 20 08:55:53 2017
+++ src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c Thu Jan 16 19:37:26 2020
@@ -87,7 +87,7 @@ test_copy(int use_open_fd)
* An archive file has no entry.
*/
static void
-test_empty_archive()
+test_empty_archive(void)
{
const char *refname = "test_read_format_7zip_empty_archive.7z";
struct archive_entry *ae;
@@ -119,7 +119,7 @@ test_empty_archive()
* in the archive file except for a header.
*/
static void
-test_empty_file()
+test_empty_file(void)
{
const char *refname = "test_read_format_7zip_empty_file.7z";
struct archive_entry *ae;
@@ -609,7 +609,7 @@ test_bcj(const char *refname)
* Extract a file compressed with PPMd.
*/
static void
-test_ppmd()
+test_ppmd(void)
{
const char *refname = "test_read_format_7zip_ppmd.7z";
struct archive_entry *ae;
@@ -663,7 +663,7 @@ test_ppmd()
}
static void
-test_symname()
+test_symname(void)
{
const char *refname = "test_read_format_7zip_symbolic_name.7z";
struct archive_entry *ae;
Index: src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file.c
diff -u src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file.c:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file.c:1.1.1.1 Thu Apr 20 08:55:40 2017
+++ src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file.c Thu Jan 16 19:37:26 2020
@@ -84,7 +84,7 @@ DEFINE_TEST(test_write_format_zip_file)
unsigned char *central_header, *local_header, *eocd, *eocd_record;
unsigned char *extension_start, *extension_end;
char file_data[] = {'1', '2', '3', '4', '5', '6', '7', '8'};
- char *file_name = "file";
+ const char *file_name = "file";
#ifndef HAVE_ZLIB_H
zip_version = 10;
Index: src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c
diff -u src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c:1.1.1.1 Thu Apr 20 08:55:49 2017
+++ src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c Thu Jan 16 19:37:26 2020
@@ -86,7 +86,7 @@ DEFINE_TEST(test_write_format_zip_file_z
unsigned char *central_header, *local_header, *eocd, *eocd_record;
unsigned char *extension_start, *extension_end;
char file_data[] = {'1', '2', '3', '4', '5', '6', '7', '8'};
- char *file_name = "file";
+ const char *file_name = "file";
#ifndef HAVE_ZLIB_H
zip_compression = 0;
Index: src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c
diff -u src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c:1.1.1.2 Wed Jul 24 09:50:38 2019
+++ src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c Thu Jan 16 19:37:26 2020
@@ -472,7 +472,7 @@ verify_sparse_file2(struct archive *a, c
}
static void
-test_sparse_whole_file_data()
+test_sparse_whole_file_data(void)
{
struct archive_entry *ae;
int64_t offset;
