summaryrefslogtreecommitdiff
path: root/src/app_extract.c
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2021-07-22 14:41:07 +0300
committerTimo Teräs <timo.teras@iki.fi>2021-07-22 16:14:49 +0300
commit33e85fb1f12b1df3a1581037267926e1e9e8aa24 (patch)
tree6918df21e248c99132981d8723bfe8a1f7ed5612 /src/app_extract.c
parente6b7fa49cea4412d761ec7d69f04f387d01374fa (diff)
downloadapk-tools-33e85fb1f12b1df3a1581037267926e1e9e8aa24.tar.gz
apk-tools-33e85fb1f12b1df3a1581037267926e1e9e8aa24.tar.bz2
apk-tools-33e85fb1f12b1df3a1581037267926e1e9e8aa24.tar.xz
apk-tools-33e85fb1f12b1df3a1581037267926e1e9e8aa24.zip
extract: remove unneeded argument from uvol_extract
Diffstat (limited to 'src/app_extract.c')
-rw-r--r--src/app_extract.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app_extract.c b/src/app_extract.c
index 1f11738..f292b61 100644
--- a/src/app_extract.c
+++ b/src/app_extract.c
@@ -102,13 +102,13 @@ static int uvol_run(struct apk_ctx *ac, char *action, const char *volname, char
return 0;
}
-static int uvol_extract(struct apk_ctx *ac, char *action, const char *volname, char *arg1, off_t sz, struct apk_istream *is, struct apk_digest_ctx *dctx)
+static int uvol_extract(struct apk_ctx *ac, const char *volname, char *arg1, off_t sz, struct apk_istream *is, struct apk_digest_ctx *dctx)
{
struct apk_out *out = &ac->out;
struct apk_ostream *os;
pid_t pid;
int r, status, pipefds[2];
- char *argv[] = { (char*)apk_ctx_get_uvol(ac), action, (char*) volname, arg1, 0 };
+ char *argv[] = { (char*)apk_ctx_get_uvol(ac), "write", (char*) volname, arg1, 0 };
posix_spawn_file_actions_t act;
if (pipe2(pipefds, O_CLOEXEC) != 0) return -errno;
@@ -148,7 +148,7 @@ static int apk_extract_volume(struct apk_ctx *ac, struct apk_file_info *fi, stru
snprintf(size, sizeof size, "%ju", fi->size);
r = uvol_run(ac, "create", fi->name, "ro", size);
if (r != 0) return r;
- return uvol_extract(ac, "write", fi->name, size, fi->size, is, dctx);
+ return uvol_extract(ac, fi->name, size, fi->size, is, dctx);
}
static int apk_extract_file(struct extract_ctx *ctx, off_t sz, struct apk_istream *is)