Wireshark · Wireshark-commits: [Wireshark-commits] master-3.2 0558578: cmdline: cleanup option string definitions

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0558578f579e717d651624cf6b6bddebc1b60bf4
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark

Commits:

0558578 by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    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@xxxxxxxxx>
    Petri-Dish: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit abd83d9961d7c90896d5f941ecd97850306e3b1f)
    Reviewed-on: https://code.wireshark.org/review/35434
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  ab22e88   html2text: Skip generating footnotes for self-links.
     add  0558578   cmdline: cleanup option string definitions


Summary of changes:
 capture_opts.h   |  8 ++++----
 dumpcap.c        | 10 +++++-----
 ui/commandline.c |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)