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

[Colin Guthrie]

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  e8a5746f2fcae59bfd18d39b621509b3ef130453 (commit)

- Log -----------------------------------------------------------------
a63cf05 More src/pulsecore/cpu-arm.c FTBFS fixes
e5e432f Fix the following warnings (which now cause buildd failures in Ubuntu 10.04):
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/cpu-arm.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

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

commit e5e432fe0aabc8fc21e987001de5cf7b69303a63
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Wed Dec 16 22:53:18 2009 -0500

    Fix the following warnings (which now cause buildd failures in Ubuntu 10.04):
    
    pulsecore/cpu-arm.c: In function 'get_cpuinfo':
    pulsecore/cpu-arm.c:70: warning: implicit declaration of function 'pa_read' [-Wimplicit-function-declaration]
    pulsecore/cpu-arm.c:72: warning: implicit declaration of function 'pa_close' [-Wimplicit-function-declaration]
    pulsecore/cpu-arm.c: In function 'pa_cpu_init_arm':
    pulsecore/cpu-arm.c:110: warning: implicit declaration of function 'pa_split_spaces' [-Wimplicit-function-declaration]
    pulsecore/cpu-arm.c:110: warning: assignment makes pointer from integer without a cast
    Function `pa_split_spaces' implicitly converted to pointer at pulsecore/cpu-arm.c:110
    
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c
index 6bb2ead..6e4bfaa 100644
--- a/src/pulsecore/cpu-arm.c
+++ b/src/pulsecore/cpu-arm.c
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 
 #include <pulse/xmalloc.h>
+#include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
 
 #include "cpu-arm.h"

commit a63cf050b0be91310ae6b0b4fa3fa2b0f95e3efa
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Wed Dec 16 23:55:05 2009 -0500

    More src/pulsecore/cpu-arm.c FTBFS fixes
    
    Fix missing argument to pa_read(), and be consistent with declaration of
    state variable in pa_cpu_init_arm().
    
    Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

diff --git a/src/pulsecore/cpu-arm.c b/src/pulsecore/cpu-arm.c
index 6e4bfaa..bf632f7 100644
--- a/src/pulsecore/cpu-arm.c
+++ b/src/pulsecore/cpu-arm.c
@@ -68,7 +68,7 @@ static char *get_cpuinfo(void) {
         return NULL;
     }
 
-    if ((n = pa_read(fd, cpuinfo, MAX_BUFFER-1)) < 0) {
+    if ((n = pa_read(fd, cpuinfo, MAX_BUFFER-1, NULL)) < 0) {
         pa_xfree(cpuinfo);
         pa_close(fd);
         return NULL;
@@ -106,7 +106,8 @@ void pa_cpu_init_arm (void) {
     }
     /* get the CPU features */
     if ((line = get_cpuinfo_line (cpuinfo, "Features"))) {
-        char *state = NULL, *current;
+        const char *state = NULL;
+        char *current;
 
         while ((current = pa_split_spaces (line, &state))) {
             if (!strcmp (current, "vfp"))

-- 
hooks/post-receive
PulseAudio Sound Server