[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-345-g57b0397

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

- Log -----------------------------------------------------------------
57b0397 client.conf.in: Typo. s/a/are/
0ac13f1 man pages: correct formatting/markup of options
f250179 shm: explicitly mark shm seg for MAP_NORESERVE to request overcommiting no matter what
-----------------------------------------------------------------------

Summary of changes:
 man/pulse-client.conf.5.xml.in |    2 +-
 man/pulse-daemon.conf.5.xml.in |   10 +++++-----
 src/pulse/client.conf.in       |    2 +-
 src/pulsecore/shm.c            |    6 +++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

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

commit f250179b4ea989c26d99268a362d57a8a7136a1f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 2 08:51:44 2010 +0100

    shm: explicitly mark shm seg for MAP_NORESERVE to request overcommiting no matter what

diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
index fbf777a..29849d5 100644
--- a/src/pulsecore/shm.c
+++ b/src/pulsecore/shm.c
@@ -154,7 +154,11 @@ int pa_shm_create_rw(pa_shm *m, size_t size, pa_bool_t shared, mode_t mode) {
             goto fail;
         }
 
-        if ((m->ptr = mmap(NULL, PA_PAGE_ALIGN(m->size), PROT_READ|PROT_WRITE, MAP_SHARED, fd, (off_t) 0)) == MAP_FAILED) {
+#ifndef MAP_NORESERVE
+#define MAP_NORESERVE 0
+#endif
+
+        if ((m->ptr = mmap(NULL, PA_PAGE_ALIGN(m->size), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_NORESERVE, fd, (off_t) 0)) == MAP_FAILED) {
             pa_log("mmap() failed: %s", pa_cstrerror(errno));
             goto fail;
         }

commit 0ac13f17bae05764d080eb9e164224e6aaf59175
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Sun Jan 31 12:44:59 2010 +0100

    man pages: correct formatting/markup of options

diff --git a/man/pulse-client.conf.5.xml.in b/man/pulse-client.conf.5.xml.in
index c2a847f..739fae4 100644
--- a/man/pulse-client.conf.5.xml.in
+++ b/man/pulse-client.conf.5.xml.in
@@ -69,7 +69,7 @@ USA.
 
     <option>
       <p><opt>autospawn=</opt> Autospawn a PulseAudio daemon when
-      needed. Takes a boolean value, defaults to "yes".</p>
+      needed. Takes a boolean value, defaults to <opt>yes</opt>.</p>
     </option>
 
     <option>
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index e6b1e19..b5c9e92 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -53,14 +53,14 @@ USA.
 
     <option>
       <p><opt>daemonize= </opt> Daemonize after startup. Takes a
-      boolean value, defaults to "no". The <opt>--daemonize</opt>
+      boolean value, defaults to <opt>no</opt>. The <opt>--daemonize</opt>
       command line option takes precedence.</p>
     </option>
 
     <option>
       <p><opt>fail=</opt> Fail to start up if any of the directives
       in the configuration script <file>default.pa</file>
-      fail. Takes a boolean argument, defaults to "yes". The <opt>--fail</opt> command line
+      fail. Takes a boolean argument, defaults to <opt>yes</opt>. The <opt>--fail</opt> command line
       option takes precedence.</p>
     </option>
 
@@ -191,7 +191,7 @@ USA.
       RLIMIT_NICE is used. root is dropped immediately after gaining
       the nice level on startup, thus it is presumably safe. See
       <manref section="1" name="pulseaudio"/> for more
-      information. Takes a boolean argument, defaults to "yes". The <opt>--high-priority</opt>
+      information. Takes a boolean argument, defaults to <opt>yes</opt>. The <opt>--high-priority</opt>
       command line option takes precedence.</p>
     </option>
 
@@ -205,7 +205,7 @@ USA.
       real-time. The controlling thread is left a normally scheduled
       thread. Thus enabling the high-priority option is orthogonal.
       See <manref section="1" name="pulseaudio"/> for more
-      information. Takes a boolean argument, defaults to "yes". The
+      information. Takes a boolean argument, defaults to <opt>yes</opt>. The
       <opt>--realtime</opt> command line option takes precedence.</p>
     </option>
 
@@ -215,7 +215,7 @@ USA.
       by default, 9 for clients. Thus it is recommended to choose the
       PulseAudio real-time priorities lower. Some PulseAudio threads
       might choose a priority a little lower or higher than the
-      specified value. Defaults to "5".</p>
+      specified value. Defaults to <opt>5</opt>.</p>
     </option>
 
     <option>

commit 57b0397823088fd3e15119f0e1aeb6b7bc2bc90b
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date:   Sat Jan 30 13:59:52 2010 +0100

    client.conf.in: Typo. s/a/are/
    
    This is the same typo as reported in [1] and fixed in [2] in `client.conf.in`.
    
    I did `git grep "values a commented"` and did not get anymore hits.
    
    [1] http://pulseaudio.org/ticket/783
    [2] http://git.0pointer.de/?p=pulseaudio.git;a=commit;h=ea8927f1d47be101a1f64b2f87fd6e527ff76dbe

diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in
index 436747b..17753b0 100644
--- a/src/pulse/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -16,7 +16,7 @@
 # USA.
 
 ## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
-## more information. Default values a commented out.  Use either ; or # for
+## more information. Default values are commented out.  Use either ; or # for
 ## commenting.
 
 ; default-sink =

-- 
hooks/post-receive
PulseAudio Sound Server