[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-10-g39a26d8

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  b03a650160def727ff6547cdc35351d76dceecfd (commit)

- Log -----------------------------------------------------------------
39a26d8 log: use pa_logl() instead of pa_log_level()
b9f1af4 log: print file name only when we have it
6773d00 util: if NULL is passed to pa_path_get_filename() just hand it through
-----------------------------------------------------------------------

Summary of changes:
 src/pulse/util.c    |    3 ++-
 src/pulse/util.h    |    2 +-
 src/pulsecore/log.c |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------

commit 6773d000e381651f00c8ffad74cf96e6d0647da9
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun Apr 19 19:02:16 2009 +0200

    util: if NULL is passed to pa_path_get_filename() just hand it through

diff --git a/src/pulse/util.c b/src/pulse/util.c
index 54a188d..6f1e40a 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -219,7 +219,8 @@ char *pa_get_binary_name(char *s, size_t l) {
 char *pa_path_get_filename(const char *p) {
     char *fn;
 
-    pa_assert(p);
+    if (!p)
+        return NULL;
 
     if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
         return fn+1;
diff --git a/src/pulse/util.h b/src/pulse/util.h
index f6dd40c..ad85653 100644
--- a/src/pulse/util.h
+++ b/src/pulse/util.h
@@ -51,7 +51,7 @@ char *pa_get_home_dir(char *s, size_t l);
 char *pa_get_binary_name(char *s, size_t l);
 
 /** Return a pointer to the filename inside a path (which is the last
- * component). */
+ * component). If passed NULL will return NULL. */
 char *pa_path_get_filename(const char *p);
 
 /** Wait t milliseconds */

commit b9f1af48d2402c197f640bfaed0ca169d2d38cbd
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun Apr 19 19:04:50 2009 +0200

    log: print file name only when we have it

diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c
index 60ea9c5..919ebe1 100644
--- a/src/pulsecore/log.c
+++ b/src/pulsecore/log.c
@@ -285,7 +285,7 @@ void pa_log_levelv_meta(
 
     if ((_flags & PA_LOG_PRINT_META) && file && line > 0 && func)
         pa_snprintf(location, sizeof(location), "[%s:%i %s()] ", file, line, func);
-    else if (_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE))
+    else if ((_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE)) && file)
         pa_snprintf(location, sizeof(location), "%s: ", pa_path_get_filename(file));
     else
         location[0] = 0;

commit 39a26d8c6bedd83dacf658ec81cbd1d91f2aefb1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun Apr 19 19:05:25 2009 +0200

    log: use pa_logl() instead of pa_log_level()

diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c
index 919ebe1..15d192d 100644
--- a/src/pulsecore/log.c
+++ b/src/pulsecore/log.c
@@ -323,7 +323,7 @@ void pa_log_levelv_meta(
 #endif
 
     if (!pa_utf8_valid(text))
-        pa_log_level(level, __FILE__": invalid UTF-8 string following below:");
+        pa_logl(level, "Invalid UTF-8 string following below:");
 
     for (t = text; t; t = n) {
         if ((n = strchr(t, '\n'))) {

-- 
hooks/post-receive
PulseAudio Sound Server