diff options
| author | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-03-30 17:42:29 -0400 |
|---|---|---|
| committer | Roman Neuhauser <neuhauser@sigpipe.cz> | 2011-03-30 17:42:29 -0400 |
| commit | d5efdaa4bd2f25e789066c6182b58fb3d1e56ffa (patch) | |
| tree | 646d1babe94681698e13b27ee74e54b0252fbefe /libarchive/archive_read_support_filter_program.c | |
| parent | a5716d1577549ad773d6daa946074d3da73adf0c (diff) | |
| download | libarchive-d5efdaa4bd2f25e789066c6182b58fb3d1e56ffa.tar.gz | |
archive_read.c: s/__archive_errx/archive_set_error/
the last two calls were in __archive_read_get_bidder() and
__archive_read_register_format(). __archive_read_get_bidder()
required a change in interface (not really, but if it calls
archive_set_error(), it should return ARCHIVE_*); i added
a wrapper macro ala archive_check_magic() to keep it DRY.
some but not all archive_read_support_compression_*() functions
called archive_clear_error() right after __archive_read_get_bidder.
the reason isn't clear to me and no tests break without these
calls, so i've removed them.
SVN-Revision: 3132
Diffstat (limited to 'libarchive/archive_read_support_filter_program.c')
| -rw-r--r-- | libarchive/archive_read_support_filter_program.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libarchive/archive_read_support_filter_program.c b/libarchive/archive_read_support_filter_program.c index a7799726..03eb0d31 100644 --- a/libarchive/archive_read_support_filter_program.c +++ b/libarchive/archive_read_support_filter_program.c @@ -164,9 +164,7 @@ archive_read_support_compression_program_signature(struct archive *_a, /* * Get a bidder object from the read core. */ - bidder = __archive_read_get_bidder(a); - if (bidder == NULL) - return (ARCHIVE_FATAL); + archive_read_get_bidder(a, bidder); /* * Allocate our private state. |