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 /capture_opts.h | |
| 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 'capture_opts.h')
| -rw-r--r-- | capture_opts.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/capture_opts.h b/capture_opts.h index 7ad9df6ea8..ccbab03ed3 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -35,14 +35,6 @@ extern "C" { * We do not currently have long options corresponding to all short * options; we should probably pick appropriate option names for them. * - * 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 < 4096, so as to leave values >= 4096 for - * other long options. - * * NOTE: * for tshark, we're using a leading - in the optstring to prevent getopt() * from permuting the argv[] entries, in this case, unknown argv[] entries @@ -50,9 +42,9 @@ extern "C" { * In short: we must not use 1 here, which is another reason to use * values outside the range of ASCII graphic characters. */ -#define LONGOPT_NUM_CAP_COMMENT 128 -#define LONGOPT_LIST_TSTAMP_TYPES 129 -#define LONGOPT_SET_TSTAMP_TYPE 130 +#define LONGOPT_NUM_CAP_COMMENT LONGOPT_BASE_CAPTURE+1 +#define LONGOPT_LIST_TSTAMP_TYPES LONGOPT_BASE_CAPTURE+2 +#define LONGOPT_SET_TSTAMP_TYPE LONGOPT_BASE_CAPTURE+3 /* * Options for capturing common to all capturing programs. |