be more carful wrt. signed vs. unsigned argument passing
[paraslash.git] / oggdec.c
index 82ac9b4..1cd1f02 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
                if (*fn->fc->input_eof)
                        return 0;
                errno = EAGAIN;
-               return -1;
+               return (size_t)-1;
        }
        ret = PARA_MIN(nmemb, have / size) * size;
        memcpy(buf, p, ret);
@@ -161,19 +161,19 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
                        return -E_OGGDEC_FAULT;
                fn->fc->channels = ov_info(pod->vf, 0)->channels;
                fn->fc->samplerate = ov_info(pod->vf, 0)->rate;
-               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels, fn->fc->samplerate);
+               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels,
+                       fn->fc->samplerate);
        }
-again:
-       ret = ov_read(pod->vf, fn->buf + fn->loaded, fn->bufsize - fn->loaded,
-               ENDIAN, BITS / 8, SIGN, NULL);
-       if (ret == OV_HOLE || !ret) {
-               return pod->converted;
+       while (!*fn->fc->input_eof && fn->loaded < fn->bufsize) {
+               int length = fn->bufsize - fn->loaded;
+               long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
+                       ENDIAN, BITS / 8, SIGN, NULL);
+               if (read_ret == OV_HOLE || !read_ret)
+                       return pod->converted;
+               if (read_ret < 0)
+                       return -E_OGGDEC_BADLINK;
+               fn->loaded += read_ret;
        }
-       if (ret < 0)
-               return -E_OGGDEC_BADLINK;
-       fn->loaded += ret;
-       if (!*fn->fc->input_eof && fn->loaded < fn->bufsize)
-               goto again;
        return pod->converted;
 }