cmdline: cleanup option string definitions
authorJaap Keuter <jaap.keuter@xs4all.nl>
Fri, 13 Dec 2019 12:13:32 +0000 (13:13 +0100)
committerGerald Combs <gerald@wireshark.org>
Fri, 13 Dec 2019 22:29:01 +0000 (22:29 +0000)
commitabd83d9961d7c90896d5f941ecd97850306e3b1f
treec1cd7bd4f8464f0ec060706a348654ad31da1c50
parent8b8bf626000291c0187715196ee907c1b5265a99
cmdline: cleanup option string definitions

Option string composition has grown organically over time and is
depending on compilation options also. This results in somewhat complex
macro definitions and the use of the string concatenation feature of the
C compiler. This change tries to clean up some of this magic by removing
definitions of empty strings and merging of adjacent strings.

Change-Id: I968449ea9b564915bee468a0cac0e114983ceebe
Reviewed-on: https://code.wireshark.org/review/35429
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
capture_opts.h
dumpcap.c
ui/commandline.c