From 4c31ff9b452eee995e621bd877f321eea974fc7e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 4 Sep 2007 20:01:19 +0000
Subject: [PATCH] fix a couple of compiler warnings

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1768 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/modules/module-alsa-sink.c   | 4 ++--
 src/modules/module-alsa-source.c | 4 ++--
 src/pulsecore/protocol-native.c  | 4 ++--
 src/pulsecore/rtpoll.c           | 3 ++-
 src/pulsecore/sound-file.c       | 2 +-
 src/tests/interpol-test.c        | 2 +-
 src/utils/paplay.c               | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 24765a0..c75f195 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -135,7 +135,7 @@ static int mmap_write(struct userdata *u) {
             if (err == -EAGAIN)
                 return work_done;
             
-            pa_log("snd_pcm_avail_update: %s", snd_strerror(n));
+            pa_log("snd_pcm_avail_update: %s", snd_strerror(err));
             return -1;
         }
 
@@ -225,7 +225,7 @@ static int unix_write(struct userdata *u) {
         int err;
                 
         if ((err = snd_pcm_status(u->pcm_handle, status)) < 0) {
-            pa_log("Failed to query DSP status data: %s", snd_strerror(t));
+            pa_log("Failed to query DSP status data: %s", snd_strerror(err));
             return -1;
         }
 
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 0d76cab..9922668 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -132,7 +132,7 @@ static int mmap_read(struct userdata *u) {
             if (err == -EAGAIN)
                 return work_done;
             
-            pa_log("snd_pcm_avail_update: %s", snd_strerror(n));
+            pa_log("snd_pcm_avail_update: %s", snd_strerror(err));
             return -1;
         }
 
@@ -216,7 +216,7 @@ static int unix_read(struct userdata *u) {
         pa_memchunk chunk;
         
         if ((err = snd_pcm_status(u->pcm_handle, status)) < 0) {
-            pa_log("Failed to query DSP status data: %s", snd_strerror(t));
+            pa_log("Failed to query DSP status data: %s", snd_strerror(err));
             return -1;
         }
 
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index ea7f43c..a4983a0 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -439,8 +439,8 @@ static record_stream* record_stream_new(
         const pa_sample_spec *ss,
         const pa_channel_map *map,
         const char *name,
-        size_t *maxlength,
-        size_t fragment_size,
+        uint32_t *maxlength,
+        uint32_t fragment_size,
         int corked) {
 
     record_stream *s;
diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index 0f09c7d..e43ec61 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -383,7 +383,8 @@ finish:
         }
     }
 
-    errno = saved_errno;
+    if (r < 0)
+        errno = saved_errno;
 
     return r;
 }
diff --git a/src/pulsecore/sound-file.c b/src/pulsecore/sound-file.c
index 7c8b597..ef43eef 100644
--- a/src/pulsecore/sound-file.c
+++ b/src/pulsecore/sound-file.c
@@ -126,7 +126,7 @@ int pa_sound_file_load(
     ptr = pa_memblock_acquire(chunk->memblock);
 
     if ((readf_function && readf_function(sf, ptr, sfinfo.frames) != sfinfo.frames) ||
-        (!readf_function && sf_read_raw(sf, ptr, l) != l)) {
+        (!readf_function && sf_read_raw(sf, ptr, l) != (sf_count_t) l)) {
         pa_log("Premature file end");
         goto finish;
     }
diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c
index 3953043..85a509d 100644
--- a/src/tests/interpol-test.c
+++ b/src/tests/interpol-test.c
@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
             pa_gettimeofday(&now);
 
             rtc = pa_timeval_diff(&now, &start);
-            printf("%i\t%llu\t%llu\t%llu\t%llu\t%u\n", k, rtc, t, rtc-old_rtc, t-old_t, changed);
+            printf("%i\t%llu\t%llu\t%llu\t%llu\t%u\n", k, (unsigned long long) rtc, (unsigned long long) t, (unsigned long long) (rtc-old_rtc), (unsigned long long) (t-old_t), changed);
             old_t = t;
             old_rtc = rtc;
         }
diff --git a/src/utils/paplay.c b/src/utils/paplay.c
index 2c779a7..e7076d2 100644
--- a/src/utils/paplay.c
+++ b/src/utils/paplay.c
@@ -123,7 +123,7 @@ static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
     else
         pa_xfree(data);
 
-    if (bytes < length) {
+    if (bytes < (sf_count_t) length) {
         sf_close(sndfile);
         sndfile = NULL;
         pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL));
-- 
2.7.4