1
1

If we're sending output to stdout, then make errors go to stderr. (#695)

No effect on JSON format output or output to a file.

Submitted by @cygnus2048, fixes #688.
Этот коммит содержится в:
Bruce A. Mah 2018-01-26 11:38:15 -08:00 коммит произвёл GitHub
родитель cf325910bd
Коммит bd85edb80a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23

Просмотреть файл

@ -1,5 +1,5 @@
/*
* iperf, Copyright (c) 2014, 2015, 2016, 2017, The Regents of the University of
* iperf, Copyright (c) 2014-2018, The Regents of the University of
* California, through Lawrence Berkeley National Laboratory (subject
* to receipt of any required approvals from the U.S. Dept. of
* Energy). All rights reserved.
@ -45,7 +45,7 @@ iperf_err(struct iperf_test *test, const char *format, ...)
if (test != NULL && test->json_output && test->json_top != NULL)
cJSON_AddStringToObject(test->json_top, "error", str);
else
if (test && test->outfile) {
if (test && test->outfile && test->outfile != stdout) {
fprintf(test->outfile, "iperf3: %s\n", str);
}
else {
@ -67,7 +67,7 @@ iperf_errexit(struct iperf_test *test, const char *format, ...)
cJSON_AddStringToObject(test->json_top, "error", str);
iperf_json_finish(test);
} else
if (test && test->outfile) {
if (test && test->outfile && test->outfile != stdout) {
fprintf(test->outfile, "iperf3: %s\n", str);
}
else {