summaryrefslogtreecommitdiff
path: root/libarchive/archive_write_add_filter_program.c
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2019-10-19 17:09:11 +0200
committerJoerg Sonnenberger <joerg@bec.de>2019-11-27 21:34:32 +0100
commit1411b0b9bf001d577f7400c700a8dc0c59aa539d (patch)
tree357751dbbbdc91b1c6afa72239e3a461cf898138 /libarchive/archive_write_add_filter_program.c
parent8abba216575ed8f2cfdeefc85b9598928a846959 (diff)
downloadlibarchive-1411b0b9bf001d577f7400c700a8dc0c59aa539d.tar.gz
Refactor archive_write_close_filter logic
Diffstat (limited to 'libarchive/archive_write_add_filter_program.c')
-rw-r--r--libarchive/archive_write_add_filter_program.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libarchive/archive_write_add_filter_program.c b/libarchive/archive_write_add_filter_program.c
index 660f693f..74588d3a 100644
--- a/libarchive/archive_write_add_filter_program.c
+++ b/libarchive/archive_write_add_filter_program.c
@@ -353,11 +353,11 @@ int
__archive_write_program_close(struct archive_write_filter *f,
struct archive_write_program_data *data)
{
- int ret, r1, status;
+ int ret, status;
ssize_t bytes_read;
if (data->child == 0)
- return __archive_write_close_filter(f->next_filter);
+ return ARCHIVE_OK;
ret = 0;
close(data->child_stdin);
@@ -409,7 +409,6 @@ cleanup:
"Error closing program: %s", data->program_name);
ret = ARCHIVE_FATAL;
}
- r1 = __archive_write_close_filter(f->next_filter);
- return (r1 < ret ? r1 : ret);
+ return ret;
}