diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-10-30 17:37:10 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-10-31 00:37:42 +0000 |
| commit | 706c10663499b90639ab8e46e171c4d4952778bf (patch) | |
| tree | 5835d1fb6dd242d25c4b35eedf20152d90d8384e /ui/commandline.c | |
| parent | 45a023f3d0f616d518a1eb0b08b68c109def3616 (diff) | |
| download | wireshark-706c10663499b90639ab8e46e171c4d4952778bf.tar.gz | |
Have the routine that handles dissection options not exit.
Have it return TRUE if the option is OK and FALSE if it isn't, and let
its caller exit as appropriate.
Also, rename it - it's not adding something to a collection, it's just
handling the option.
Change-Id: I41863cbb67b7c257d900d3011609891b9b4a7467
Reviewed-on: https://code.wireshark.org/review/18587
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/commandline.c')
| -rw-r--r-- | ui/commandline.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/commandline.c b/ui/commandline.c index 39f0da54e2..85f8375442 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -580,7 +580,8 @@ void commandline_other_options(int argc, char *argv[], gboolean opt_reset) case LONGOPT_DISABLE_PROTOCOL: /* disable dissection of protocol */ case LONGOPT_ENABLE_HEURISTIC: /* enable heuristic dissection of protocol */ case LONGOPT_DISABLE_HEURISTIC: /* disable heuristic dissection of protocol */ - dissect_opts_add_opt(opt, optarg); + if (!dissect_opts_handle_opt(opt, optarg)) + exit(1); break; case LONGOPT_FULL_SCREEN: global_commandline_info.full_screen = TRUE; |