diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-08-24 13:35:36 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-08-24 13:35:36 +0300 |
| commit | edb45ae46449ddabcac3dea6b3f42c6cec01510a (patch) | |
| tree | a27a046df30e4ead8f36c559dabdecb2fa1d7ea5 /src/app_cache.c | |
| parent | 82de29cf7bad3d9cbb0aeb4dbe756ad2bde73eb3 (diff) | |
| download | apk-tools-edb45ae46449ddabcac3dea6b3f42c6cec01510a.tar.gz apk-tools-edb45ae46449ddabcac3dea6b3f42c6cec01510a.tar.bz2 apk-tools-edb45ae46449ddabcac3dea6b3f42c6cec01510a.tar.xz apk-tools-edb45ae46449ddabcac3dea6b3f42c6cec01510a.zip | |
enforce options definitions to bind the enum and the descriptor
This uses some macro trickery to make sure that there's one-to-one
mapping with the option index enum and the descriptor. The down
side is that enum's are generated via #define's and editors might
not pick them up for auto completion, but the benefits are more:
it's no longer possible have mismatching enum value and descriptor
index, and the amount of source code lines is less.
Diffstat (limited to 'src/app_cache.c')
| -rw-r--r-- | src/app_cache.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/app_cache.c b/src/app_cache.c index 8f38807..f4dd951 100644 --- a/src/app_cache.c +++ b/src/app_cache.c @@ -28,15 +28,11 @@ struct cache_ctx { unsigned short solver_flags; }; -enum { - OPT_CACHE_latest, - OPT_CACHE_upgrade, -}; +#define CACHE_OPTIONS(OPT) \ + OPT(OPT_CACHE_latest, APK_OPT_SH("l") "latest") \ + OPT(OPT_CACHE_upgrade, APK_OPT_SH("u") "upgrade") -static const char option_desc[] = - APK_OPTAPPLET - APK_OPT2n("latest", "l") - APK_OPT2n("upgrade", "u"); +APK_OPT_APPLET(option_desc, CACHE_OPTIONS); static int option_parse_applet(void *ctx, struct apk_db_options *dbopts, int opt, const char *optarg) { |