format: Forward errors/warnings in support_format
If registering a format parser bidder fails or triggers a warning, forward the information instead of silently turning it into ARCHIVE_OK. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This commit is contained in:
1 parent
a2b7dea95f
commit
d42b4c1999
8 files changed
+9
-9
No files matched your search
@@ -505,7 +505,7 @@ archive_read_support_format_7zip(struct archive *_a)
|
||||
|
||||
if (r != ARCHIVE_OK)
|
||||
free(zip);
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -488,7 +488,7 @@ archive_read_support_format_cab(struct archive *_a)
|
||||
archive_wstring_free(&cab->ws);
|
||||
free(cab);
|
||||
}
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -254,7 +254,7 @@ archive_read_support_format_cpio(struct archive *_a)
|
||||
|
||||
if (r != ARCHIVE_OK)
|
||||
free(cpio);
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -285,7 +285,7 @@ archive_read_support_format_lha(struct archive *_a)
|
||||
|
||||
if (r != ARCHIVE_OK)
|
||||
free(lha);
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
static size_t
|
||||
|
||||
@@ -238,7 +238,7 @@ archive_read_support_format_mtree(struct archive *_a)
|
||||
|
||||
if (r != ARCHIVE_OK)
|
||||
free(mtree);
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -4497,5 +4497,5 @@ int archive_read_support_format_rar5(struct archive *_a) {
|
||||
free(rar5);
|
||||
}
|
||||
|
||||
return ARCHIVE_OK;
|
||||
return ret;
|
||||
}
|
||||
@@ -294,7 +294,7 @@ archive_read_support_format_tar(struct archive *_a)
|
||||
|
||||
if (r != ARCHIVE_OK)
|
||||
free(tar);
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -3911,7 +3911,7 @@ archive_read_support_format_zip_streamable(struct archive *_a)
|
||||
|
||||
if (r != ARCHIVE_OK)
|
||||
free(zip);
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------------ */
|
||||
@@ -4704,7 +4704,7 @@ archive_read_support_format_zip_seekable(struct archive *_a)
|
||||
|
||||
if (r != ARCHIVE_OK)
|
||||
free(zip);
|
||||
return (ARCHIVE_OK);
|
||||
return (r);
|
||||
}
|
||||
|
||||
/*# vim:set noet:*/
|
||||
Reference in new issue
Block a user