github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter: Unify add_filter style

Browse Source 
This makes it easier to spot differences, which might require more
attention.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This commit is contained in:
Tobias Stoeckmann committed 2026-07-17 19:02:35 +02:00
1 parent 421b6c267d
commit 727da55204
12 files changed
+57 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libarchive/archive_write_add_filter_b64encode.c
+2 -2
View File
@@ -98,11 +98,11 @@ archive_write_add_filter_b64encode(struct archive *a)
f = __archive_write_allocate_filter(a);
if (f == NULL)
goto memerr;
f->data = state;
f->name = "b64encode";
f->code = ARCHIVE_FILTER_UU;
f->open = archive_filter_b64encode_open;
f->data = state;
f->options = archive_filter_b64encode_options;
f->open = archive_filter_b64encode_open;
f->write = archive_filter_b64encode_write;
f->close = archive_filter_b64encode_close;
f->free = archive_filter_b64encode_free;
libarchive/archive_write_add_filter_bzip2.c
+10 -7
View File
@@ -91,12 +91,14 @@ archive_write_add_filter_bzip2(struct archive *a)
goto memerr;
#if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
data->compression_level = 9;
r = ARCHIVE_OK;
#else
data->pdata = __archive_write_program_allocate("bzip2");
if (data->pdata == NULL)
goto memerr;
data->compression_level = 0;
archive_set_error(a, ARCHIVE_ERRNO_MISC,
"Using external bzip2 program");
r = ARCHIVE_WARN;
@@ -105,14 +107,15 @@ archive_write_add_filter_bzip2(struct archive *a)
f = __archive_write_allocate_filter(a);
if (f == NULL)
goto memerr;
f->data = data;
f->options = &archive_compressor_bzip2_options;
f->close = &archive_compressor_bzip2_close;
f->free = &archive_compressor_bzip2_free;
f->open = &archive_compressor_bzip2_open;
f->write = archive_compressor_bzip2_write;
f->code = ARCHIVE_FILTER_BZIP2;
f->name = "bzip2";
f->code = ARCHIVE_FILTER_BZIP2;
f->data = data;
f->options = archive_compressor_bzip2_options;
f->open = archive_compressor_bzip2_open;
f->write = archive_compressor_bzip2_write;
f->close = archive_compressor_bzip2_close;
f->free = archive_compressor_bzip2_free;
return (r);
memerr:
free_data(data);
libarchive/archive_write_add_filter_compress.c
+4 -3
View File
@@ -141,13 +141,14 @@ archive_write_add_filter_compress(struct archive *a)
f = __archive_write_allocate_filter(a);
if (f == NULL)
goto memerr;
f->name = "compress";
f->code = ARCHIVE_FILTER_COMPRESS;
f->data = state;
f->open = &archive_compressor_compress_open;
f->open = archive_compressor_compress_open;
f->write = archive_compressor_compress_write;
f->close = archive_compressor_compress_close;
f->free = archive_compressor_compress_free;
f->code = ARCHIVE_FILTER_COMPRESS;
f->name = "compress";
return (ARCHIVE_OK);
memerr:
free_data(state);
libarchive/archive_write_add_filter_grzip.c
+1 -1
View File
@@ -70,8 +70,8 @@ archive_write_add_filter_grzip(struct archive *a)
f->name = "grzip";
f->code = ARCHIVE_FILTER_GRZIP;
f->data = data;
f->open = archive_write_grzip_open;
f->options = archive_write_grzip_options;
f->open = archive_write_grzip_open;
f->write = archive_write_grzip_write;
f->close = archive_write_grzip_close;
f->free = archive_write_grzip_free;
libarchive/archive_write_add_filter_gzip.c
+9 -7
View File
@@ -111,12 +111,14 @@ archive_write_add_filter_gzip(struct archive *a)
data->original_filename = NULL;
#ifdef HAVE_ZLIB_H
data->compression_level = Z_DEFAULT_COMPRESSION;
r = ARCHIVE_OK;
#else
data->pdata = __archive_write_program_allocate("gzip");
if (data->pdata == NULL)
goto memerr;
data->compression_level = 0;
archive_set_error(a, ARCHIVE_ERRNO_MISC,
"Using external gzip program");
r = ARCHIVE_WARN;
@@ -125,14 +127,14 @@ archive_write_add_filter_gzip(struct archive *a)
f = __archive_write_allocate_filter(a);
if (f == NULL)
goto memerr;
f->data = data;
f->open = &archive_compressor_gzip_open;
f->write = archive_compressor_gzip_write;
f->options = &archive_compressor_gzip_options;
f->close = &archive_compressor_gzip_close;
f->free = &archive_compressor_gzip_free;
f->code = ARCHIVE_FILTER_GZIP;
f->name = "gzip";
f->code = ARCHIVE_FILTER_GZIP;
f->data = data;
f->options = archive_compressor_gzip_options;
f->open = archive_compressor_gzip_open;
f->write = archive_compressor_gzip_write;
f->close = archive_compressor_gzip_close;
f->free = archive_compressor_gzip_free;
return (r);
memerr:
libarchive/archive_write_add_filter_lrzip.c
+1 -1
View File
@@ -76,8 +76,8 @@ archive_write_add_filter_lrzip(struct archive *a)
f->name = "lrzip";
f->code = ARCHIVE_FILTER_LRZIP;
f->data = data;
f->open = archive_write_lrzip_open;
f->options = archive_write_lrzip_options;
f->open = archive_write_lrzip_open;
f->write = archive_write_lrzip_write;
f->close = archive_write_lrzip_close;
f->free = archive_write_lrzip_free;
libarchive/archive_write_add_filter_lz4.c
+10 -7
View File
@@ -115,6 +115,7 @@ archive_write_add_filter_lz4(struct archive *a)
data->block_maximum_size = 7;
#if defined(HAVE_LIBLZ4) && LZ4_VERSION_MAJOR >= 1 && LZ4_VERSION_MINOR >= 2
data->compression_level = 1;
r = ARCHIVE_OK;
#else
/*
@@ -125,6 +126,7 @@ archive_write_add_filter_lz4(struct archive *a)
if (data->pdata == NULL)
goto memerr;
data->compression_level = 0;
archive_set_error(a, ARCHIVE_ERRNO_MISC,
"Using external lz4 program");
r = ARCHIVE_WARN;
@@ -136,14 +138,15 @@ archive_write_add_filter_lz4(struct archive *a)
f = __archive_write_allocate_filter(a);
if (f == NULL)
goto memerr;
f->data = data;
f->options = &archive_filter_lz4_options;
f->close = &archive_filter_lz4_close;
f->free = &archive_filter_lz4_free;
f->open = &archive_filter_lz4_open;
f->write = archive_filter_lz4_write;
f->code = ARCHIVE_FILTER_LZ4;
f->name = "lz4";
f->code = ARCHIVE_FILTER_LZ4;
f->data = data;
f->options = archive_filter_lz4_options;
f->open = archive_filter_lz4_open;
f->write = archive_filter_lz4_write;
f->close = archive_filter_lz4_close;
f->free = archive_filter_lz4_free;
return (r);
memerr:
free_data(data);
libarchive/archive_write_add_filter_lzop.c
+4 -1
View File
@@ -161,12 +161,14 @@ archive_write_add_filter_lzop(struct archive *a)
return (ARCHIVE_FATAL);
}
data->compression_level = 5;
r = ARCHIVE_OK;
#else
data->pdata = __archive_write_program_allocate("lzop");
if (data->pdata == NULL)
goto memerr;
data->compression_level = 0;
/* Note: We return "warn" to inform of using an external lzop
* program. */
archive_set_error(a, ARCHIVE_ERRNO_MISC,
@@ -180,11 +182,12 @@ archive_write_add_filter_lzop(struct archive *a)
f->name = "lzop";
f->code = ARCHIVE_FILTER_LZOP;
f->data = data;
f->open = archive_write_lzop_open;
f->options = archive_write_lzop_options;
f->open = archive_write_lzop_open;
f->write = archive_write_lzop_write;
f->close = archive_write_lzop_close;
f->free = archive_write_lzop_free;
return (r);
memerr:
free_data(data);
libarchive/archive_write_add_filter_program.c
+1
View File
@@ -123,6 +123,7 @@ archive_write_add_filter_program(struct archive *a, const char *cmd)
f->write = archive_compressor_program_write;
f->close = archive_compressor_program_close;
f->free = archive_compressor_program_free;
return (ARCHIVE_OK);
memerr:
free_data(data);
libarchive/archive_write_add_filter_uuencode.c
+2 -2
View File
@@ -87,11 +87,11 @@ archive_write_add_filter_uuencode(struct archive *a)
f = __archive_write_allocate_filter(a);
if (f == NULL)
goto memerr;
f->data = state;
f->name = "uuencode";
f->code = ARCHIVE_FILTER_UU;
f->open = archive_filter_uuencode_open;
f->data = state;
f->options = archive_filter_uuencode_options;
f->open = archive_filter_uuencode_open;
f->write = archive_filter_uuencode_write;
f->close = archive_filter_uuencode_close;
f->free = archive_filter_uuencode_free;
libarchive/archive_write_add_filter_xz.c
+3 -2
View File
@@ -160,11 +160,12 @@ common_setup(struct archive *a, const char *name, int code)
f->name = name;
f->code = code;
f->data = data;
f->open = &archive_compressor_xz_open;
f->options = archive_compressor_xz_options;
f->open = archive_compressor_xz_open;
f->write = archive_compressor_xz_write;
f->close = archive_compressor_xz_close;
f->free = archive_compressor_xz_free;
f->options = &archive_compressor_xz_options;
return (ARCHIVE_OK);
memerr:
free_data(data);
libarchive/archive_write_add_filter_zstd.c
+10 -8
View File
@@ -144,6 +144,7 @@ archive_write_add_filter_zstd(struct archive *a)
data->pdata = __archive_write_program_allocate("zstd");
if (data->pdata == NULL)
goto memerr;
archive_set_error(a, ARCHIVE_ERRNO_MISC,
"Using external zstd program");
r = ARCHIVE_WARN;
@@ -152,15 +153,16 @@ archive_write_add_filter_zstd(struct archive *a)
f = __archive_write_allocate_filter(a);
if (f == NULL)
goto memerr;
f->data = data;
f->open = &archive_compressor_zstd_open;
f->write = archive_compressor_zstd_write;
f->options = &archive_compressor_zstd_options;
f->flush = &archive_compressor_zstd_flush;
f->close = &archive_compressor_zstd_close;
f->free = &archive_compressor_zstd_free;
f->code = ARCHIVE_FILTER_ZSTD;
f->name = "zstd";
f->code = ARCHIVE_FILTER_ZSTD;
f->data = data;
f->options = archive_compressor_zstd_options;
f->open = archive_compressor_zstd_open;
f->write = archive_compressor_zstd_write;
f->flush = archive_compressor_zstd_flush;
f->close = archive_compressor_zstd_close;
f->free = archive_compressor_zstd_free;
return (r);
memerr:
free_data(data);