summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/log.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-06-13 22:08:14 +0000
committerLennart Poettering <lennart@poettering.net>2007-06-13 22:08:14 +0000
commitbe4a8828360b3607414c3ebfd836494e6490267d (patch)
tree765c44df62326769c1356483f79f5d300ddab9b3 /src/pulsecore/log.c
parent69115687ad1604ddfa9fa7cd86eb286e6bb5ea9a (diff)
A lot of more work to get the lock-free stuff in place
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1474 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/log.c')
-rw-r--r--src/pulsecore/log.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c
index 0033adb9..a1197eb5 100644
--- a/src/pulsecore/log.c
+++ b/src/pulsecore/log.c
@@ -71,14 +71,11 @@ static const char level_to_char[] = {
};
void pa_log_set_ident(const char *p) {
- if (log_ident)
- pa_xfree(log_ident);
- if (log_ident_local)
- pa_xfree(log_ident_local);
+ pa_xfree(log_ident);
+ pa_xfree(log_ident_local);
log_ident = pa_xstrdup(p);
- log_ident_local = pa_utf8_to_locale(log_ident);
- if (!log_ident_local)
+ if (!(log_ident_local = pa_utf8_to_locale(log_ident)))
log_ident_local = pa_xstrdup(log_ident);
}