diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-10-05 18:52:51 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-10-09 16:09:19 +0300 |
| commit | 354713d2f746c197eed6a1feb4c6af3420af6c15 (patch) | |
| tree | f9dd51bbdde0f25f8e122832cf006076b8452d28 /src/app_adbsign.c | |
| parent | 7a7eca86709fcf31dbb1acf8b82ff411828fb67b (diff) | |
| download | apk-tools-354713d2f746c197eed6a1feb4c6af3420af6c15.tar.gz apk-tools-354713d2f746c197eed6a1feb4c6af3420af6c15.tar.bz2 apk-tools-354713d2f746c197eed6a1feb4c6af3420af6c15.tar.xz apk-tools-354713d2f746c197eed6a1feb4c6af3420af6c15.zip | |
rename apk_db_options to apk_ctx, rework logging
makes apk_verbosity non-global
fixes #10682
Diffstat (limited to 'src/app_adbsign.c')
| -rw-r--r-- | src/app_adbsign.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/app_adbsign.c b/src/app_adbsign.c index 918948f..ddcf0c1 100644 --- a/src/app_adbsign.c +++ b/src/app_adbsign.c @@ -19,7 +19,7 @@ struct sign_ctx { APK_OPT_APPLET(option_desc, ADBSIGN_OPTIONS); -static int option_parse_applet(void *pctx, struct apk_db_options *dbopts, int optch, const char *optarg) +static int option_parse_applet(void *pctx, struct apk_ctx *ac, int optch, const char *optarg) { struct sign_ctx *ctx = (struct sign_ctx *) pctx; @@ -64,6 +64,7 @@ static int update_signatures(struct adb_xfrm *xfrm, struct adb_block *blk, struc static int adbsign_main(void *pctx, struct apk_database *db, struct apk_string_array *args) { + struct apk_out *out = &db->ctx->out; struct sign_ctx *ctx = pctx; char **arg; int r; @@ -75,7 +76,7 @@ static int adbsign_main(void *pctx, struct apk_database *db, struct apk_string_a adb_c_xfrm(&ctx->xfrm, update_signatures); apk_istream_close(ctx->xfrm.is); r = apk_ostream_close(ctx->xfrm.os); - if (r) apk_error("%s: %s", *arg, apk_error_str(r)); + if (r) apk_err(out, "%s: %s", *arg, apk_error_str(r)); } return 0; |