mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a couple of compiler warnings

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1768 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-04 20:01:19 +00:00
parent 2dbe137daf
commit 4c31ff9b45
7 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-alsa-sink.c
View file

@ -135,7 +135,7 @@ static int mmap_write(struct userdata *u) {
if (err == -EAGAIN) if (err == -EAGAIN)
return work_done; 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; return -1;
} }
@ -225,7 +225,7 @@ static int unix_write(struct userdata *u) {
int err; int err;
if ((err = snd_pcm_status(u->pcm_handle, status)) < 0) { 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; return -1;
} }

4
src/modules/module-alsa-source.c
View file

@ -132,7 +132,7 @@ static int mmap_read(struct userdata *u) {
if (err == -EAGAIN) if (err == -EAGAIN)
return work_done; 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; return -1;
} }
@ -216,7 +216,7 @@ static int unix_read(struct userdata *u) {
pa_memchunk chunk; pa_memchunk chunk;
if ((err = snd_pcm_status(u->pcm_handle, status)) < 0) { 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; return -1;
} }

4
src/pulsecore/protocol-native.c
View file

@ -439,8 +439,8 @@ static record_stream* record_stream_new(
const pa_sample_spec *ss, const pa_sample_spec *ss,
const pa_channel_map *map, const pa_channel_map *map,
const char *name, const char *name,
size_t *maxlength, uint32_t *maxlength,
size_t fragment_size, uint32_t fragment_size,
int corked) { int corked) {
record_stream *s; record_stream *s;

3
src/pulsecore/rtpoll.c
View file

@ -383,7 +383,8 @@ finish:
} }
} }
errno = saved_errno; if (r < 0)
errno = saved_errno;
return r; return r;
} }

2
src/pulsecore/sound-file.c
View file

@ -126,7 +126,7 @@ int pa_sound_file_load(
ptr = pa_memblock_acquire(chunk->memblock); ptr = pa_memblock_acquire(chunk->memblock);
if ((readf_function && readf_function(sf, ptr, sfinfo.frames) != sfinfo.frames) || 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"); pa_log("Premature file end");
goto finish; goto finish;
} }

2
src/tests/interpol-test.c
View file

@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
pa_gettimeofday(&now); pa_gettimeofday(&now);
rtc = pa_timeval_diff(&now, &start); 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_t = t;
old_rtc = rtc; old_rtc = rtc;
} }

2
src/utils/paplay.c
View file

@ -123,7 +123,7 @@ static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
else else
pa_xfree(data); pa_xfree(data);
if (bytes < length) { if (bytes < (sf_count_t) length) {
sf_close(sndfile); sf_close(sndfile);
sndfile = NULL; sndfile = NULL;
pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL)); pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL));