cli: Move all long-option keys into cli.h
Gather all long-option key values in `cli.h` so we can have a single
enum that counts the numbers up and thus provides unique values.
Change-Id: Id9fb27b442308ee7a7d59282f6db1f8f18ef20f2
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/72983
diff --git a/cli_classic.c b/cli_classic.c
index 2621219..680fdef 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -223,15 +223,6 @@
bool show_progress = false;
struct flashprog_layout *layout = NULL;
struct flashprog_programmer *prog = NULL;
- enum {
- OPTION_IFD = 0x0100,
- OPTION_FMAP,
- OPTION_FMAP_FILE,
- OPTION_FLASH_CONTENTS,
- OPTION_FLASH_NAME,
- OPTION_FLASH_SIZE,
- OPTION_PROGRESS,
- };
int ret = 0;
static const char optstring[] = "r:Rw:v:nNVEfc:l:i:p:Lzho:";
diff --git a/include/cli.h b/include/cli.h
index aef0b8d..fb55191 100644
--- a/include/cli.h
+++ b/include/cli.h
@@ -18,6 +18,15 @@
enum {
OPTION_CHIP = 'c',
OPTION_PROGRAMMER = 'p',
+
+ /* Options below have only long option names, i.e. no single char: */
+ OPTION_IFD = 0x0100,
+ OPTION_FMAP,
+ OPTION_FMAP_FILE,
+ OPTION_FLASH_CONTENTS,
+ OPTION_FLASH_NAME,
+ OPTION_FLASH_SIZE,
+ OPTION_PROGRESS,
};
struct flash_args {