From edb45ae46449ddabcac3dea6b3f42c6cec01510a Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Mon, 24 Aug 2020 13:35:36 +0300 Subject: 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. --- src/app_fix.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'src/app_fix.c') diff --git a/src/app_fix.c b/src/app_fix.c index 43e6f7e..ccd1e3c 100644 --- a/src/app_fix.c +++ b/src/app_fix.c @@ -22,21 +22,14 @@ struct fix_ctx { int errors; }; -enum { - OPT_FIX_depends, - OPT_FIX_directory_permissions, - OPT_FIX_reinstall, - OPT_FIX_upgrade, - OPT_FIX_xattr, -}; - -static const char option_desc[] = - APK_OPTAPPLET - APK_OPT2n("depends", "d") - APK_OPT1n("directory-permissions") - APK_OPT2n("reinstall", "r") - APK_OPT2n("upgrade", "u") - APK_OPT2n("xattr", "x"); +#define FIX_OPTIONS(OPT) \ + OPT(OPT_FIX_depends, APK_OPT_SH("d") "depends") \ + OPT(OPT_FIX_directory_permissions, "directory-permissions") \ + OPT(OPT_FIX_reinstall, APK_OPT_SH("r") "reinstall") \ + OPT(OPT_FIX_upgrade, APK_OPT_SH("u") "upgrade") \ + OPT(OPT_FIX_xattr, APK_OPT_SH("x") "xattr") + +APK_OPT_APPLET(option_desc, FIX_OPTIONS); static int option_parse_applet(void *pctx, struct apk_db_options *dbopts, int opt, const char *optarg) { -- cgit v1.2.3-60-g2f50