aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKai Borowiak <quartoxuna@users.noreply.github.com>2018-04-20 16:17:39 +0200
committerBruce A. Mah <bmah@kitchenlab.org>2018-04-20 07:17:39 -0700
commit22508a21b0e816a04110edafbaae3e7938d277b3 (patch)
treea7914c0b31220162d6428908141806fa85093f0d /src
parent3e58489a5823126fd1d51fcfb74994f9e8fe4e86 (diff)
downloadiperf3-22508a21b0e816a04110edafbaae3e7938d277b3.tar.gz
Add warning if JSON output is used with explicit report format (#721)
Fixes #709.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/iperf_api.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/iperf_api.c b/src/iperf_api.c
index 8bf5296..e9551ee 100755
--- a/src/iperf_api.c
+++ b/src/iperf_api.c
@@ -1177,6 +1177,11 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
return -1;
}
+ /* Show warning if JSON output is used with explicit report format */
+ if ((test->json_output) && (test->settings->unit_format != 'a')) {
+ warning("Report format'-f' is ignored within JSON output '-J'\n");
+ }
+
return 0;
}