diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-05-04 21:45:11 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-05-06 13:05:25 +0300 |
| commit | 1d7123d83796182f851ccccaf056063955343718 (patch) | |
| tree | ca675fd3363af3584694d0db5a3b65e618ae894b /src/app_upgrade.c | |
| parent | 791f93fcbe7a543e0bb844887ba395be8ed8ea44 (diff) | |
| download | apk-tools-1d7123d83796182f851ccccaf056063955343718.tar.gz apk-tools-1d7123d83796182f851ccccaf056063955343718.tar.bz2 apk-tools-1d7123d83796182f851ccccaf056063955343718.tar.xz apk-tools-1d7123d83796182f851ccccaf056063955343718.zip | |
rewrite option descriptors to be single string
This reduces the number of relocations on PIE binaries, and also
reduces the executable size. Parsing of the options is slightly
sped up as only the exact matching option group parser is called.
Diffstat (limited to 'src/app_upgrade.c')
| -rw-r--r-- | src/app_upgrade.c | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/src/app_upgrade.c b/src/app_upgrade.c index 3f7f096..5eda0eb 100644 --- a/src/app_upgrade.c +++ b/src/app_upgrade.c @@ -25,24 +25,40 @@ struct upgrade_ctx { int ignore : 1; }; -static int option_parse_applet(void *ctx, struct apk_db_options *dbopts, int optch, const char *optarg) +enum { + OPT_UPGRADE_available, + OPT_UPGRADE_ignore, + OPT_UPGRADE_latest, + OPT_UPGRADE_no_self_upgrade, + OPT_UPGRADE_self_upgrade_only, +}; + +static const char option_desc[] = + APK_OPTAPPLET + APK_OPT2n("available", "a") + APK_OPT1n("ignore") + APK_OPT2n("latest", "l") + APK_OPT1n("no-self-upgrade") + APK_OPT1n("self-upgrade-only"); + +static int option_parse_applet(void *ctx, struct apk_db_options *dbopts, int opt, const char *optarg) { struct upgrade_ctx *uctx = (struct upgrade_ctx *) ctx; - switch (optch) { - case 0x10000: + switch (opt) { + case OPT_UPGRADE_no_self_upgrade: uctx->no_self_upgrade = 1; break; - case 0x10001: + case OPT_UPGRADE_self_upgrade_only: uctx->self_upgrade_only = 1; break; - case 0x10002: + case OPT_UPGRADE_ignore: uctx->ignore = 1; break; - case 'a': + case OPT_UPGRADE_available: uctx->solver_flags |= APK_SOLVERF_AVAILABLE; break; - case 'l': + case OPT_UPGRADE_latest: uctx->solver_flags |= APK_SOLVERF_LATEST; break; default: @@ -51,18 +67,8 @@ static int option_parse_applet(void *ctx, struct apk_db_options *dbopts, int opt return 0; } -static const struct apk_option options_applet[] = { - { 'a', "available" }, - { 'l', "latest" }, - { 0x10000, "no-self-upgrade" }, - { 0x10001, "self-upgrade-only" }, - { 0x10002, "ignore" }, -}; - static const struct apk_option_group optgroup_applet = { - .name = "Upgrade", - .options = options_applet, - .num_options = ARRAY_SIZE(options_applet), + .desc = option_desc, .parse = option_parse_applet, }; |