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.

1 files changed, 8 insertions, 15 deletions

diff --git a/src/app_fetch.c b/src/app_fetch.c
index e6f4fbe..4704b0b 100644
--- a/src/app_fetch.c
+++ b/src/app_fetch.c
@@ -66,21 +66,14 @@ static int cup(void)
 	return write(STDOUT_FILENO, buf, len) != len;
 }
 
-enum {
-	OPT_FETCH_link,
-	OPT_FETCH_recursive,
-	OPT_FETCH_output,
-	OPT_FETCH_simulate,
-	OPT_FETCH_stdout,
-};
-
-static const char option_desc[] =
-	APK_OPTAPPLET
-	APK_OPT2n("link", "l")
-	APK_OPT2n("recursive", "R")
-	APK_OPT2R("output", "o")
-	APK_OPT1n("simulate")
-	APK_OPT2n("stdout", "s");
+#define FETCH_OPTIONS(OPT) \
+	OPT(OPT_FETCH_link,		APK_OPT_SH("l") "link") \
+	OPT(OPT_FETCH_recursive,	APK_OPT_SH("R") "recursive") \
+	OPT(OPT_FETCH_output,		APK_OPT_ARG APK_OPT_SH("o") "output") \
+	OPT(OPT_FETCH_simulate,		"simulate") \
+	OPT(OPT_FETCH_stdout,		APK_OPT_SH("s") "stdout")
+
+APK_OPT_APPLET(option_desc, FETCH_OPTIONS);
 
 static int option_parse_applet(void *ctx, struct apk_db_options *dbopts, int opt, const char *optarg)
 {