summaryrefslogtreecommitdiffstats
path: root/src/pulsecore
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-04 20:01:19 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-04 20:01:19 +0000
commit4c31ff9b452eee995e621bd877f321eea974fc7e (patch)
tree280b718edf0f177fe73b81ca1a68bfa9b3c305a9 /src/pulsecore
parent2dbe137daf8c74feca75ead33d5f8fbc84544af1 (diff)
fix a couple of compiler warnings
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1768 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore')
-rw-r--r--src/pulsecore/protocol-native.c4
-rw-r--r--src/pulsecore/rtpoll.c3
-rw-r--r--src/pulsecore/sound-file.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index ea7f43ca..a4983a09 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 0f09c7d0..e43ec610 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 7c8b5970..ef43eef0 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;
}