diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2019-12-15 14:15:34 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-12-15 20:02:09 +0000 |
| commit | d90a22c1cc3a6eaf739e9f4b40ea276dbc916d62 (patch) | |
| tree | d973eed229ea71f354669d448f20dc5158ba2c12 /ui/commandline.c | |
| parent | 1cd1e36a05bd0f14b38ce3978e3313d57b3b25d4 (diff) | |
Reorganize long option values
For long options, without corresponding short options, to be processed
they need to be assigned a value, preferably outside of the range of
all possible short options. The code in various places tries to stay
clear of these low values, but further coordination is missing, easily
leading to issues when option processing code gets extended and/or
reorganized.
This change introduces a single location from where each catagory of
command line long option can derive a base value, which should minimize
potential option value collisions.
Change-Id: Ic8861a347d0050f74002de3aa1fcfb01202866e5
Reviewed-on: https://code.wireshark.org/review/35459
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui/commandline.c')
| -rw-r--r-- | ui/commandline.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ui/commandline.c b/ui/commandline.c index 39a192fc41..52bc33d681 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -188,16 +188,7 @@ commandline_print_usage(gboolean for_help_option) { #endif } -/* - * For long options with no corresponding short options, we define values - * outside the range of ASCII graphic characters, make that the last - * component of the entry for the long option, and have a case for that - * option in the switch statement. - * - * We also pick values >= 65536, so as to leave values from 128 to 65535 - * for capture and dissection options. - */ -#define LONGOPT_FULL_SCREEN 65536 +#define LONGOPT_FULL_SCREEN LONGOPT_BASE_GUI+1 #define OPTSTRING OPTSTRING_CAPTURE_COMMON OPTSTRING_DISSECT_COMMON "C:g:HhjJ:klm:o:P:r:R:Svw:X:Y:z:" static const struct option long_options[] = { |