diff options
author | Peter Wu <peter@lekensteyn.nl> | 2017-05-25 00:28:45 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-05-26 17:31:01 +0000 |
commit | c9b0e9c81335e098cdb256b1c58597cda96703b1 (patch) | |
tree | f0e2f87b53b2b9e45e90fb4c5195f008beb7e1dc /tshark.c | |
parent | 940165933fea699b7592ea2b5f128bac27b443b5 (diff) | |
download | wireshark-c9b0e9c81335e098cdb256b1c58597cda96703b1.tar.gz wireshark-c9b0e9c81335e098cdb256b1c58597cda96703b1.tar.bz2 wireshark-c9b0e9c81335e098cdb256b1c58597cda96703b1.zip |
Report syntax errors in UAT prefs parsing
Add the cause for a syntax error while parsing UATs. Example output:
$ tshark -ouat:ssl_keys:,
tshark: Invalid -o flag "uat:ssl_keys:,": ssl_keys:1: No IP address given.
$ tshark -ouat:unknown:,
tshark: Invalid -o flag "uat:unknown:,": Unknown preference
Change-Id: I549406c4e31a81d29f487ef47bdb3c22da084947
Reviewed-on: https://code.wireshark.org/review/21748
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1208,13 +1208,18 @@ main(int argc, char *argv[]) #endif break; case 'o': /* Override preference from command line */ - switch (prefs_set_pref(optarg)) { + { + char *errmsg = NULL; + + switch (prefs_set_pref(optarg, &errmsg)) { case PREFS_SET_OK: break; case PREFS_SET_SYNTAX_ERR: - cmdarg_err("Invalid -o flag \"%s\"", optarg); + cmdarg_err("Invalid -o flag \"%s\"%s%s", optarg, + errmsg ? ": " : "", errmsg ? errmsg : ""); + g_free(errmsg); exit_status = INVALID_OPTION; goto clean_exit; break; @@ -1227,6 +1232,7 @@ main(int argc, char *argv[]) break; } break; + } case 'q': /* Quiet */ quiet = TRUE; break; |