diff options
author | Dario Lombardo <lomato@gmail.com> | 2016-08-24 10:43:11 +0200 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2016-08-24 12:25:56 +0000 |
commit | f269f56c1ab485a9f3462554eb088f6895e3ccf6 (patch) | |
tree | d74517fa87d4c2655188fc3037d87835e336250e /extcap | |
parent | 2095b325998f1da06a4e80efeb186ec99d6e39ed (diff) |
extcap: make extcaps use the version registered in config.
Change-Id: I12d0d0bec06e02af0a9d0877c0f0f1d86261d752
Reviewed-on: https://code.wireshark.org/review/17296
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'extcap')
-rw-r--r-- | extcap/androiddump.c | 2 | ||||
-rw-r--r-- | extcap/ciscodump.c | 2 | ||||
-rw-r--r-- | extcap/extcap-base.c | 1 | ||||
-rw-r--r-- | extcap/randpktdump.c | 2 | ||||
-rw-r--r-- | extcap/sshdump.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index b3acf94636..9bf753d7cf 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -2554,7 +2554,7 @@ int main(int argc, char **argv) { switch (result) { case OPT_VERSION: - printf("%s.%s.%s\n", ANDROIDDUMP_VERSION_MAJOR, ANDROIDDUMP_VERSION_MINOR, ANDROIDDUMP_VERSION_RELEASE); + printf("%s\n", extcap_conf->version); return EXIT_CODE_SUCCESS; case OPT_HELP: extcap_help_print(extcap_conf); diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c index f3eedb6a31..6a5ab8adcc 100644 --- a/extcap/ciscodump.c +++ b/extcap/ciscodump.c @@ -585,7 +585,7 @@ int main(int argc, char **argv) goto end; case OPT_VERSION: - printf("%s.%s.%s\n", CISCODUMP_VERSION_MAJOR, CISCODUMP_VERSION_MINOR, CISCODUMP_VERSION_RELEASE); + printf("%s\n", extcap_conf->version); goto end; case OPT_REMOTE_HOST: diff --git a/extcap/extcap-base.c b/extcap/extcap-base.c index acb2602a54..3e690fec1d 100644 --- a/extcap/extcap-base.c +++ b/extcap/extcap-base.c @@ -313,7 +313,6 @@ void extcap_help_add_option(extcap_parameters * extcap, const char * help_option extcap->help_options = g_list_append(extcap->help_options, o); } - void extcap_help_add_header(extcap_parameters * extcap, char * help_header) { extcap->help_header = g_strdup(help_header); diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c index a64474d9ff..420caa45d6 100644 --- a/extcap/randpktdump.c +++ b/extcap/randpktdump.c @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) while ((result = getopt_long(argc, argv, ":", longopts, &option_idx)) != -1) { switch (result) { case OPT_VERSION: - printf("%s.%s.%s\n", RANDPKTDUMP_VERSION_MAJOR, RANDPKTDUMP_VERSION_MINOR, RANDPKTDUMP_VERSION_RELEASE); + printf("%s\n", extcap_conf->version); ret = EXIT_SUCCESS; goto end; diff --git a/extcap/sshdump.c b/extcap/sshdump.c index 278a3a58df..e3385c6b6d 100644 --- a/extcap/sshdump.c +++ b/extcap/sshdump.c @@ -369,7 +369,7 @@ int main(int argc, char **argv) goto end; case OPT_VERSION: - printf("%s.%s.%s\n", SSHDUMP_VERSION_MAJOR, SSHDUMP_VERSION_MINOR, SSHDUMP_VERSION_RELEASE); + printf("%s\n", extcap_conf->version); ret = EXIT_SUCCESS; goto end; |