fixes for bugs found when compiling with gcc 2.95

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@301 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/polyp/alsa-util.c b/polyp/alsa-util.c
index 52eaaed49391b118a9185ef9f38e4a986bc59525..b6b9ac11c9c7d31732d99129afaf940b75ceca7b 100644 (file)
--- a/polyp/alsa-util.c
+++ b/polyp/alsa-util.c
@@ -31,7 +31,7 @@
 #include "xmalloc.h"
 
 /* Set the hardware parameters of the given ALSA device. Returns the
- * selected fragment settings in *period/*period_size */
+ * selected fragment settings in *period and *period_size */
 int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, const struct pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size) {
     int ret = -1;
     snd_pcm_uframes_t buffer_size;

diff --git a/polyp/client-conf.c b/polyp/client-conf.c
index 2de1c57fbf4ef27ea955f92ff184ccfe4e29630e..21e0acab546bad5235fecc1c936e6d8448bf35f0 100644 (file)
--- a/polyp/client-conf.c
+++ b/polyp/client-conf.c
@@ -59,12 +59,9 @@ static const struct pa_client_conf default_conf = {
 
 struct pa_client_conf *pa_client_conf_new(void) {
     struct pa_client_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf));
-
-
     
     c->daemon_binary = pa_xstrdup(POLYPAUDIO_BINARY);
     c->extra_arguments = pa_xstrdup("--log-target=syslog --exit-idle-time=5");
-
     c->cookie_file = pa_xstrdup(PA_NATIVE_COOKIE_FILE);
     
     return c;

diff --git a/polyp/resampler.c b/polyp/resampler.c
index dbd748f7e62b3a432264639a2dda645f5bb4d685..377aa79758f6cf4be039a6ef6c752a8597706f06 100644 (file)
--- a/polyp/resampler.c
+++ b/polyp/resampler.c
@@ -397,7 +397,7 @@ static int trivial_init(struct pa_resampler*r) {
 }
 
 const char *pa_resample_method_to_string(enum pa_resample_method m) {
-    static const char const* resample_methods[] = {
+    static const char * const resample_methods[] = {
         "src-sinc-best-quality",
         "src-sinc-medium-quality",
         "src-sinc-fastest",

diff --git a/polyp/strlist-test.c b/polyp/strlist-test.c
index 01dcdf12746d8e10b02887fefde97724e96af453..b68a0415418e94ff89c9df3fdac2d2b6ef314ebe 100644 (file)
--- a/polyp/strlist-test.c
+++ b/polyp/strlist-test.c
@@ -36,4 +36,6 @@ int main(int argc, char* argv[]) {
     pa_xfree(t);
 
     pa_strlist_free(l);
+
+    return 0;
 }

diff --git a/polyp/util.c b/polyp/util.c
index 87beafb33d86c2c7e55900f1dc6c3bcbad7fb23b..0b459ddc2cc45349ae204a9a04485ec84569ec05 100644 (file)
--- a/polyp/util.c
+++ b/polyp/util.c
@@ -225,8 +225,6 @@ char *pa_vsprintf_malloc(const char *format, va_list ap) {
     
     for(;;) {
         int r;
-        va_list ap;
-
         c = pa_xrealloc(c, size);
         r = vsnprintf(c, size, format, ap);