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

merge glitch-free branch back into trunk

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-15 23:34:41 +00:00
parent 91f092eadc
commit 045c1d602d
189 changed files with 12559 additions and 4959 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/pulsecore/log.c
View file

@ -30,6 +30,7 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
@ -108,7 +109,12 @@ void pa_log_levelv_meta(
va_list ap) {
const char *e;
char *text, *t, *n, *location;
char *t, *n;
int saved_errno = errno;
/* We don't use dynamic memory allocation here to minimize the hit
* in RT threads */
char text[1024], location[128];
pa_assert(level < PA_LOG_LEVEL_MAX);
pa_assert(format);
@ -116,17 +122,19 @@ void pa_log_levelv_meta(
if ((e = getenv(ENV_LOGLEVEL)))
maximal_level = atoi(e);
if (level > maximal_level)
if (level > maximal_level) {
errno = saved_errno;
return;
}
text = pa_vsprintf_malloc(format, ap);
pa_vsnprintf(text, sizeof(text), format, ap);
if (getenv(ENV_LOGMETA) && file && line > 0 && func)
location = pa_sprintf_malloc("[%s:%i %s()] ", file, line, func);
pa_snprintf(location, sizeof(location), "[%s:%i %s()] ", file, line, func);
else if (file)
location = pa_sprintf_malloc("%s: ", pa_path_get_filename(file));
pa_snprintf(location, sizeof(location), "%s: ", pa_path_get_filename(file));
else
location = pa_xstrdup("");
location[0] = 0;
if (!pa_utf8_valid(text))
pa_log_level(level, __FILE__": invalid UTF-8 string following below:");
@ -158,6 +166,8 @@ void pa_log_levelv_meta(
}
#endif
/* We shouldn't be using dynamic allocation here to
* minimize the hit in RT threads */
local_t = pa_utf8_to_locale(t);
if (!local_t)
fprintf(stderr, "%c: %s%s%s%s\n", level_to_char[level], location, prefix, t, suffix);
@ -189,11 +199,10 @@ void pa_log_levelv_meta(
#endif
case PA_LOG_USER: {
char *x;
char x[1024];
x = pa_sprintf_malloc("%s%s", location, t);
pa_snprintf(x, sizeof(x), "%s%s", location, t);
user_log_func(level, x);
pa_xfree(x);
break;
}
@ -204,8 +213,7 @@ void pa_log_levelv_meta(
}
}
pa_xfree(text);
pa_xfree(location);
errno = saved_errno;
}
void pa_log_level_meta(