mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

change pa_log() and friends to not require a trailing \n on all logged strings

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@574 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-02-23 02:27:19 +00:00
parent cb59817b4a
commit 4a64b0d116
74 changed files with 558 additions and 532 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/polypcore/log.c
View file

@ -26,6 +26,8 @@
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
@ -73,6 +75,8 @@ void pa_log_set_target(pa_log_target_t t, void (*func)(pa_log_level_t l, const c
void pa_log_levelv(pa_log_level_t level, const char *format, va_list ap) {
const char *e;
char *text, *t, *n;
assert(level < PA_LOG_LEVEL_MAX);
if ((e = getenv(ENV_LOGLEVEL)))
@ -81,31 +85,55 @@ void pa_log_levelv(pa_log_level_t level, const char *format, va_list ap) {
if (level > maximal_level)
return;
switch (log_target) {
case PA_LOG_STDERR:
vfprintf(stderr, format, ap);
break;
text = pa_vsprintf_malloc(format, ap);
#ifdef HAVE_SYSLOG_H
case PA_LOG_SYSLOG:
openlog(log_ident ? log_ident : "???", LOG_PID, LOG_USER);
vsyslog(level_to_syslog[level], format, ap);
closelog();
break;
#endif
case PA_LOG_USER: {
char *t = pa_vsprintf_malloc(format, ap);
assert(user_log_func);
user_log_func(level, t);
pa_xfree(t);
for (t = text; t; t = n) {
if ((n = strchr(t, '\n'))) {
*n = 0;
n++;
}
if (!*t)
continue;
switch (log_target) {
case PA_LOG_STDERR: {
const char *prefix = "", *suffix = "";
/* Yes indeed. Useless, but fun! */
if (isatty(STDERR_FILENO)) {
if (level <= PA_LOG_ERROR) {
prefix = "\x1B[1;31m";
suffix = "\x1B[0m";
} else if (level <= PA_LOG_WARN) {
prefix = "\x1B[1m";
suffix = "\x1B[0m";
}
}
fprintf(stderr, "%s%s%s\n", prefix, t, suffix);
break;
}
#ifdef HAVE_SYSLOG_H
case PA_LOG_SYSLOG:
openlog(log_ident ? log_ident : "???", LOG_PID, LOG_USER);
syslog(level_to_syslog[level], "%s", t);
closelog();
break;
#endif
case PA_LOG_USER:
user_log_func(level, t);
break;
case PA_LOG_NULL:
default:
break;
}
case PA_LOG_NULL:
default:
break;
}
pa_xfree(text);
}
void pa_log_level(pa_log_level_t level, const char *format, ...) {