[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-2-gbb00934

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

- Log -----------------------------------------------------------------
bb00934... hide doxygen docs from git
68ae1d4... fix two thinkos in signal reset/close_all code
-----------------------------------------------------------------------

Summary of changes:
 doxygen/.gitignore        |    1 +
 src/pulsecore/core-util.c |   23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

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

commit 68ae1d4d00bea671d2244248b3566ceba646c483
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jul 29 15:36:00 2008 +0200

    fix two thinkos in signal reset/close_all code

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index d259fb1..c8dc7e5 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -1887,17 +1887,21 @@ int pa_close_allv(const int except_fds[]) {
     if (getrlimit(RLIMIT_NOFILE, &rl) < 0)
         return -1;
 
-    for (fd = 0; fd < (int) rl.rlim_max; fd++) {
+    for (fd = 3; fd < (int) rl.rlim_max; fd++) {
         int i;
+        pa_bool_t found;
 
-        if (fd <= 3)
-            continue;
-
+        found = FALSE;
         for (i = 0; except_fds[i] >= 0; i++)
-            if (except_fds[i] == fd)
-                continue;
+            if (except_fds[i] == fd) {
+                found = TRUE;
+                break;
+            }
 
-        if (close(fd) < 0 && errno != EBADF)
+        if (found)
+            continue;
+
+        if (pa_close(fd) < 0 && errno != EBADF)
             return -1;
     }
 
@@ -1972,10 +1976,11 @@ int pa_reset_sigs(int except, ...) {
 
     i = 0;
     if (except >= 1) {
+        int sig;
         p[i++] = except;
 
-        while ((p[i++] = va_arg(ap, int)) >= 0)
-            ;
+        while ((sig = va_arg(ap, int)) >= 0)
+            sig = p[i++];
     }
     p[i] = -1;
 

commit bb009345ca3cb2ccf50c357fd5a652c8f959f943
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jul 29 15:36:25 2008 +0200

    hide doxygen docs from git

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index ca9b444..a709d16 100644
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -1 +1,2 @@
 doxygen.conf
+html

-- 
hooks/post-receive
PulseAudio Sound Server