summaryrefslogtreecommitdiff
path: root/libarchive/archive_write_add_filter_lrzip.c
diff options
context:
space:
mode:
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>2012-10-13 16:30:17 +0900
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>2012-10-13 16:30:17 +0900
commit2692cbcf3d2263d838dceefb1eced0489ed133e0 (patch)
treed6c407ccb14d4ee263151ec4432f1e546a5f4eba /libarchive/archive_write_add_filter_lrzip.c
parent6879299837ff53709e11cb337f8b47002147f78c (diff)
downloadlibarchive-2692cbcf3d2263d838dceefb1eced0489ed133e0.tar.gz
Integrate __archive_write_program_set_cmd into __archive_write_program_open.
Diffstat (limited to 'libarchive/archive_write_add_filter_lrzip.c')
-rw-r--r--libarchive/archive_write_add_filter_lrzip.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/libarchive/archive_write_add_filter_lrzip.c b/libarchive/archive_write_add_filter_lrzip.c
index 679554fc..85fdf6af 100644
--- a/libarchive/archive_write_add_filter_lrzip.c
+++ b/libarchive/archive_write_add_filter_lrzip.c
@@ -158,17 +158,10 @@ archive_write_lrzip_open(struct archive_write_filter *f)
archive_strcat(&as, " -L ");
archive_strappend_char(&as, '0' + data->compression_level);
}
- r = __archive_write_program_set_cmd(data->pdata, as.s);
- if (r != ARCHIVE_OK)
- goto memerr;
- archive_string_free(&as);
- r = __archive_write_program_open(f, data->pdata);
- return (r);
-memerr:
+ r = __archive_write_program_open(f, data->pdata, as.s);
archive_string_free(&as);
- archive_set_error(f->archive, ENOMEM, "Can't allocate memory");
- return (ARCHIVE_FATAL);
+ return (r);
}
static int