[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-33-g91b64bc

[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  068afb3478f96c29ba39ee9b723a9ed8a6090519 (commit)

- Log -----------------------------------------------------------------
91b64bc... Fix a potential C++/C99 ism, add a log message on error condition
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/pid.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

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

commit 91b64bc96b941692f7fd507e4afbe3bd1b9f9001
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Wed Oct 8 22:56:12 2008 +0200

    Fix a potential C++/C99 ism, add a log message on error condition
    
    Signed-off-by: Lennart Poettering <lennart at poettering.net>

diff --git a/src/pulsecore/pid.c b/src/pulsecore/pid.c
index ce8ef19..99ba3e1 100644
--- a/src/pulsecore/pid.c
+++ b/src/pulsecore/pid.c
@@ -211,6 +211,7 @@ int pa_pid_file_create(const char *procname) {
     if ((pid = read_pid(fn, fd)) == (pid_t) -1)
         pa_log_warn("Corrupt PID file, overwriting.");
     else if (pid > 0) {
+        int ours = 1;
 
 #ifdef OS_IS_WIN32
         if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid)) != NULL) {
@@ -218,11 +219,13 @@ int pa_pid_file_create(const char *procname) {
 #else
         if (kill(pid, 0) >= 0 || errno != ESRCH) {
 #endif
-            int ours = 1;
 
             if (procname)
-                if ((ours = proc_name_ours(pid, procname)) < 0)
+                if ((ours = proc_name_ours(pid, procname)) < 0) {
+                    pa_log_warn("Could not check to see if pid %lu is a pulseaudio process. "
+                                "Asssuming it is and the daemon is already running.", (unsigned long) pid);
                     goto fail;
+                }
 
             if (ours) {
                 pa_log("Daemon already running.");

-- 
hooks/post-receive
PulseAudio Sound Server