BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

log: Bring back the "sr: " default log prefix 

This got lost accidentally with the removal of the logdomain API.
This commit is contained in:
Daniel Elstner 2015-09-13 12:32:03 +02:00
parent 782b16447b
commit 22c50ed973
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/log.c
View File

@ -161,6 +161,7 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
{ {
uint64_t elapsed_us, minutes; uint64_t elapsed_us, minutes;
unsigned int rest_us, seconds, microseconds; unsigned int rest_us, seconds, microseconds;
int ret;
/* This specific log callback doesn't need the void pointer data. */ /* This specific log callback doesn't need the void pointer data. */
(void)cb_data; (void)cb_data;
@ -177,13 +178,14 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
seconds = rest_us / G_TIME_SPAN_SECOND; seconds = rest_us / G_TIME_SPAN_SECOND;
microseconds = rest_us % G_TIME_SPAN_SECOND; microseconds = rest_us % G_TIME_SPAN_SECOND;
if (fprintf(stderr, "[%.2" PRIu64 ":%.2u.%.6u] ", ret = fprintf(stderr, "sr: [%.2" PRIu64 ":%.2u.%.6u] ",
minutes, seconds, microseconds) < 0) minutes, seconds, microseconds);
return SR_ERR; } else {
ret = fputs("sr: ", stderr);
} }
if (vfprintf(stderr, format, args) < 0)
return SR_ERR; if (ret < 0 || vfprintf(stderr, format, args) < 0
if (putc('\n', stderr) < 0) || putc('\n', stderr) < 0)
return SR_ERR; return SR_ERR;
return SR_OK; return SR_OK;