diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2019-10-19 17:09:11 +0200 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2019-11-27 21:34:32 +0100 |
| commit | 1411b0b9bf001d577f7400c700a8dc0c59aa539d (patch) | |
| tree | 357751dbbbdc91b1c6afa72239e3a461cf898138 /libarchive/archive_write_add_filter_b64encode.c | |
| parent | 8abba216575ed8f2cfdeefc85b9598928a846959 (diff) | |
| download | libarchive-1411b0b9bf001d577f7400c700a8dc0c59aa539d.tar.gz | |
Refactor archive_write_close_filter logic
Diffstat (limited to 'libarchive/archive_write_add_filter_b64encode.c')
| -rw-r--r-- | libarchive/archive_write_add_filter_b64encode.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libarchive/archive_write_add_filter_b64encode.c b/libarchive/archive_write_add_filter_b64encode.c index b46b19a0..fe4ae247 100644 --- a/libarchive/archive_write_add_filter_b64encode.c +++ b/libarchive/archive_write_add_filter_b64encode.c @@ -266,7 +266,6 @@ static int archive_filter_b64encode_close(struct archive_write_filter *f) { struct private_b64encode *state = (struct private_b64encode *)f->data; - int ret, ret2; /* Flush remaining bytes. */ if (state->hold_len != 0) @@ -274,12 +273,8 @@ archive_filter_b64encode_close(struct archive_write_filter *f) archive_string_sprintf(&state->encoded_buff, "====\n"); /* Write the last block */ archive_write_set_bytes_in_last_block(f->archive, 1); - ret = __archive_write_filter(f->next_filter, + return __archive_write_filter(f->next_filter, state->encoded_buff.s, archive_strlen(&state->encoded_buff)); - ret2 = __archive_write_close_filter(f->next_filter); - if (ret > ret2) - ret = ret2; - return (ret); } static int |