OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

logger: Check fprintf return value for trace format text 

log format text comes from ldc file (may be invalid),
so error check is needed. Don't treat it as fatal error,
because this error may not impact following logs, when
formatting text is root cause of the issue.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
This commit is contained in:
Karol Trzcinski 2020-09-24 13:03:55 +02:00 committed by Liam Girdwood
parent 5eb9c49258
commit adc447e8e4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/logger/convert.c
View File

@ -323,6 +323,7 @@ static void print_entry_params(const struct log_entry_header *dma_log,
float dt = to_usecs(dma_log->timestamp - last_timestamp);
struct proc_ldc_entry proc_entry;
static char time_fmt[32];
int ret;
if (raw_output)
use_colors = 0;
@ -401,24 +402,32 @@ static void print_entry_params(const struct log_entry_header *dma_log,
switch (proc_entry.header.params_num) {
case 0:
fprintf(out_fd, "%s", proc_entry.text);
ret = fprintf(out_fd, "%s", proc_entry.text);
break;
case 1:
fprintf(out_fd, proc_entry.text, proc_entry.params[0]);
ret = fprintf(out_fd, proc_entry.text, proc_entry.params[0]);
break;
case 2:
fprintf(out_fd, proc_entry.text, proc_entry.params[0], proc_entry.params[1]);
ret = fprintf(out_fd, proc_entry.text, proc_entry.params[0], proc_entry.params[1]);
break;
case 3:
fprintf(out_fd, proc_entry.text, proc_entry.params[0], proc_entry.params[1],
proc_entry.params[2]);
ret = fprintf(out_fd, proc_entry.text, proc_entry.params[0], proc_entry.params[1],
proc_entry.params[2]);
break;
case 4:
fprintf(out_fd, proc_entry.text, proc_entry.params[0], proc_entry.params[1],
proc_entry.params[2], proc_entry.params[3]);
ret = fprintf(out_fd, proc_entry.text, proc_entry.params[0], proc_entry.params[1],
proc_entry.params[2], proc_entry.params[3]);
break;
default:
log_err("Unsupported number of arguments for '%s'", proc_entry.text);
ret = 0; /* don't log ferror */
break;
}
free_proc_ldc_entry(&proc_entry);
/* log format text comes from ldc file (may be invalid), so error check is needed here */
if (ret < 0)
log_err("trace fprintf failed for '%s', %d '%s'",
proc_entry.text, ferror(out_fd), strerror(ferror(out_fd)));
fprintf(out_fd, "%s\n", use_colors ? KNRM : "");
fflush(out_fd);
}