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

format: Unify support_format styles

Browse Source 
Use same style across all formats for easier audits.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This commit is contained in:
Tobias Stoeckmann committed 2026-08-03 19:57:25 +02:00
1 parent cb3cd6f09c
commit af46e0e7b2
14 files changed
+50 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libarchive/archive_read_support_format_7zip.c
+1 -3
View File
@@ -478,8 +478,7 @@ archive_read_support_format_7zip(struct archive *_a)
zip = calloc(1, sizeof(*zip));
if (zip == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate 7zip data");
archive_set_error(_a, ENOMEM, "Can't allocate 7zip data");
return (ARCHIVE_FATAL);
}
@@ -489,7 +488,6 @@ archive_read_support_format_7zip(struct archive *_a)
*/
zip->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
r = __archive_read_register_format(a,
zip,
"7zip",
libarchive/archive_read_support_format_ar.c
+1 -2
View File
@@ -106,8 +106,7 @@ archive_read_support_format_ar(struct archive *_a)
ar = calloc(1, sizeof(*ar));
if (ar == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate ar data");
archive_set_error(_a, ENOMEM, "Can't allocate ar data");
return (ARCHIVE_FATAL);
}
ar->strtab = NULL;
libarchive/archive_read_support_format_cab.c
+2 -3
View File
@@ -459,14 +459,13 @@ archive_read_support_format_cab(struct archive *_a)
cab = calloc(1, sizeof(*cab));
if (cab == NULL) {
archive_set_error(&a->archive, ENOMEM,
archive_set_error(_a, ENOMEM,
"Can't allocate CAB data");
return (ARCHIVE_FATAL);
}
archive_string_init(&cab->ws);
if (archive_wstring_ensure(&cab->ws, 256) == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate memory");
archive_set_error(_a, ENOMEM, "Can't allocate memory");
free(cab);
return (ARCHIVE_FATAL);
}
libarchive/archive_read_support_format_cpio.c
+1 -1
View File
@@ -234,7 +234,7 @@ archive_read_support_format_cpio(struct archive *_a)
cpio = calloc(1, sizeof(*cpio));
if (cpio == NULL) {
archive_set_error(&a->archive, ENOMEM, "Can't allocate cpio data");
archive_set_error(_a, ENOMEM, "Can't allocate cpio data");
return (ARCHIVE_FATAL);
}
cpio->magic = CPIO_MAGIC;
libarchive/archive_read_support_format_iso9660.c
+1 -2
View File
@@ -464,8 +464,7 @@ archive_read_support_format_iso9660(struct archive *_a)
iso9660 = calloc(1, sizeof(*iso9660));
if (iso9660 == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate iso9660 data");
archive_set_error(_a, ENOMEM, "Can't allocate iso9660 data");
return (ARCHIVE_FATAL);
}
iso9660->magic = ISO9660_MAGIC;
libarchive/archive_read_support_format_lha.c
+1 -2
View File
@@ -264,8 +264,7 @@ archive_read_support_format_lha(struct archive *_a)
lha = calloc(1, sizeof(*lha));
if (lha == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate lha data");
archive_set_error(_a, ENOMEM, "Can't allocate lha data");
return (ARCHIVE_FATAL);
}
archive_string_init(&lha->ws);
libarchive/archive_read_support_format_mtree.c
+13 -4
View File
@@ -224,8 +224,7 @@ archive_read_support_format_mtree(struct archive *_a)
mtree = calloc(1, sizeof(*mtree));
if (mtree == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate mtree data");
archive_set_error(_a, ENOMEM, "Can't allocate mtree data");
return (ARCHIVE_FATAL);
}
mtree->checkfs = 0;
@@ -233,8 +232,18 @@ archive_read_support_format_mtree(struct archive *_a)
__archive_rb_tree_init(&mtree->rbtree, &rb_ops);
r = __archive_read_register_format(a, mtree, "mtree",
mtree_bid, archive_read_format_mtree_options, read_header, read_data, skip, NULL, cleanup, NULL, NULL);
r = __archive_read_register_format(a,
mtree,
"mtree",
mtree_bid,
archive_read_format_mtree_options,
read_header,
read_data,
skip,
NULL,
cleanup,
NULL,
NULL);
if (r != ARCHIVE_OK)
free(mtree);
libarchive/archive_read_support_format_rar.c
+12 -12
View File
@@ -736,7 +736,7 @@ archive_read_support_format_rar(struct archive *_a)
rar = calloc(1, sizeof(*rar));
if (rar == NULL)
{
archive_set_error(&a->archive, ENOMEM, "Can't allocate rar data");
archive_set_error(_a, ENOMEM, "Can't allocate rar data");
return (ARCHIVE_FATAL);
}
@@ -747,17 +747,17 @@ archive_read_support_format_rar(struct archive *_a)
rar->has_encrypted_entries = ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW;
r = __archive_read_register_format(a,
rar,
"rar",
archive_read_format_rar_bid,
archive_read_format_rar_options,
archive_read_format_rar_read_header,
archive_read_format_rar_read_data,
archive_read_format_rar_read_data_skip,
archive_read_format_rar_seek_data,
archive_read_format_rar_cleanup,
archive_read_support_format_rar_capabilities,
archive_read_format_rar_has_encrypted_entries);
rar,
"rar",
archive_read_format_rar_bid,
archive_read_format_rar_options,
archive_read_format_rar_read_header,
archive_read_format_rar_read_data,
archive_read_format_rar_read_data_skip,
archive_read_format_rar_seek_data,
archive_read_format_rar_cleanup,
archive_read_support_format_rar_capabilities,
archive_read_format_rar_has_encrypted_entries);
if (r != ARCHIVE_OK)
free(rar);
libarchive/archive_read_support_format_rar5.c
+7 -18
View File
@@ -889,16 +889,6 @@ static void reset_file_context(struct rar5 *rar5) {
free_filters(rar5);
}
static inline int get_archive_read(struct archive* a,
struct archive_read** ar)
{
*ar = (struct archive_read*) a;
archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
"archive_read_support_format_rar5");
return ARCHIVE_OK;
}
static int read_ahead(struct archive_read* a, size_t how_many,
const uint8_t** ptr)
{
@@ -4458,12 +4448,12 @@ static void rar5_deinit(struct rar5 *rar5) {
}
int archive_read_support_format_rar5(struct archive *_a) {
struct archive_read* ar;
int ret;
struct archive_read* ar = (struct archive_read*)_a;
struct rar5 *rar5;
int r;
if(ARCHIVE_OK != (ret = get_archive_read(_a, &ar)))
return ret;
archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
"archive_read_support_format_rar5");
rar5 = malloc(sizeof(*rar5));
if(rar5 == NULL) {
@@ -4479,7 +4469,7 @@ int archive_read_support_format_rar5(struct archive *_a) {
return ARCHIVE_FATAL;
}
ret = __archive_read_register_format(ar,
r = __archive_read_register_format(ar,
rar5,
"rar5",
rar5_bid,
@@ -4492,10 +4482,9 @@ int archive_read_support_format_rar5(struct archive *_a) {
rar5_capabilities,
rar5_has_encrypted_entries);
if(ret != ARCHIVE_OK) {
if(r != ARCHIVE_OK) {
rar5_deinit(rar5);
free(rar5);
}
return ret;
return r;
}
libarchive/archive_read_support_format_raw.c
+2 -2
View File
@@ -64,8 +64,7 @@ archive_read_support_format_raw(struct archive *_a)
raw = calloc(1, sizeof(*raw));
if (raw == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate raw data");
archive_set_error(_a, ENOMEM, "Can't allocate raw data");
return (ARCHIVE_FATAL);
}
@@ -81,6 +80,7 @@ archive_read_support_format_raw(struct archive *_a)
archive_read_format_raw_cleanup,
NULL,
NULL);
if (r != ARCHIVE_OK)
free(raw);
return (r);
libarchive/archive_read_support_format_tar.c
+4 -3
View File
@@ -272,8 +272,7 @@ archive_read_support_format_tar(struct archive *_a)
tar = calloc(1, sizeof(*tar));
if (tar == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate tar data");
archive_set_error(_a, ENOMEM, "Can't allocate tar data");
return (ARCHIVE_FATAL);
}
#ifdef HAVE_COPYFILE_H
@@ -281,7 +280,9 @@ archive_read_support_format_tar(struct archive *_a)
tar->process_mac_extensions = 1;
#endif
r = __archive_read_register_format(a, tar, "tar",
r = __archive_read_register_format(a,
tar,
"tar",
archive_read_format_tar_bid,
archive_read_format_tar_options,
archive_read_format_tar_read_header,
libarchive/archive_read_support_format_warc.c
+1 -2
View File
@@ -150,8 +150,7 @@ archive_read_support_format_warc(struct archive *_a)
ARCHIVE_STATE_NEW, "archive_read_support_format_warc");
if ((warc = calloc(1, sizeof(*warc))) == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate warc data");
archive_set_error(_a, ENOMEM, "Can't allocate warc data");
return (ARCHIVE_FATAL);
}
libarchive/archive_read_support_format_xar.c
+3 -3
View File
@@ -460,8 +460,8 @@ static int xmllite_read_toc(struct archive_read *);
int
archive_read_support_format_xar(struct archive *_a)
{
struct xar *xar;
struct archive_read *a = (struct archive_read *)_a;
struct xar *xar;
int r;
archive_check_magic(_a, ARCHIVE_READ_MAGIC,
@@ -469,8 +469,7 @@ archive_read_support_format_xar(struct archive *_a)
xar = calloc(1, sizeof(*xar));
if (xar == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate xar data");
archive_set_error(_a, ENOMEM, "Can't allocate xar data");
return (ARCHIVE_FATAL);
}
@@ -491,6 +490,7 @@ archive_read_support_format_xar(struct archive *_a)
xar_cleanup,
NULL,
NULL);
if (r != ARCHIVE_OK)
free(xar);
return (r);
libarchive/archive_read_support_format_zip.c
+1 -2
View File
@@ -3881,8 +3881,7 @@ archive_read_support_format_zip_streamable(struct archive *_a)
zip = calloc(1, sizeof(*zip));
if (zip == NULL) {
archive_set_error(&a->archive, ENOMEM,
"Can't allocate zip data");
archive_set_error(_a, ENOMEM, "Can't allocate zip data");
return (ARCHIVE_FATAL);
}