]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
Merge branch 'xf_64_compile_warning_fixes'
authorAndre <maan@p133.(none)>
Tue, 7 Mar 2006 13:20:09 +0000 (14:20 +0100)
committerAndre <maan@p133.(none)>
Tue, 7 Mar 2006 13:20:09 +0000 (14:20 +0100)
1  2 
audiod.c

diff --combined audiod.c
index ede35ab02e6ac97738fcaae3659929a49dc82287,eab44b4c936123eeaf687a5847adbb043645fcd7..ccc3f9b962b5d7627d16026b5820b0f9ab9a882f
+++ b/audiod.c
@@@ -987,16 -987,16 +987,16 @@@ static int write_audio_data(int slot_nu
                buf = &rn->buf;
                len = &rn->loaded;
        }
-       PARA_DEBUG_LOG("writing %p (%d bytes)\n", *buf, *len);
+       PARA_DEBUG_LOG("writing %p (%zd bytes)\n", *buf, *len);
        rv = write(s->write_fd, *buf, *len);
-       PARA_DEBUG_LOG("wrote %d/%d\n", rv, *len);
+       PARA_DEBUG_LOG("wrote %d/%zd\n", rv, *len);
        if (rv < 0) {
                PARA_WARNING_LOG("write error in slot %d (fd %d): %s\n",
                        slot_num, s->write_fd, strerror(errno));
                *len = 0;
                s->fci->error = E_WRITE_AUDIO_DATA;
        } else if (rv != *len) {
-               PARA_DEBUG_LOG("partial %s write (%i/%i) for slot %d\n",
+               PARA_DEBUG_LOG("partial %s write (%i/%zd) for slot %d\n",
                        audio_formats[s->format], rv, *len, slot_num);
                *len -= rv;
                memmove(*buf, *buf + rv, *len);
@@@ -1545,7 -1545,7 +1545,7 @@@ repeat
                } else {
                        status_buf[ret + sbo] = '\0';
                        sbo = for_each_line(status_buf, ret + sbo,
 -                              &check_stat_line, 0);
 +                              &check_stat_line);
                }
        }
        slot_io(&wfds);