clean up error.h
[paraslash.git] / ogg_afh.c
index 6a66b8e..94383c4 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -106,17 +106,16 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks
                0, /* no initial bytes */
                c); /* the ov_open_callbacks */
 
-       /* FIXME: provide better error codes */
        if (ret == OV_EREAD)
                return -E_OGG_READ;
        if (ret == OV_ENOTVORBIS)
-               return -E_OGG_READ;
+               return -E_VORBIS;
        if (ret == OV_EVERSION)
-               return -E_OGG_READ;
+               return -E_OGG_VERSION;
        if (ret == OV_EBADHEADER)
-               return -E_OGG_READ;
+               return -E_OGG_BAD_HEADER;
        if (ret < 0)
-               return -E_OGG_READ;
+               return -E_OGG_UNKNOWN_ERROR;
        return 1;
 
 }
@@ -151,7 +150,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
        ogg_stream_init(stream_out, serial);
        ret = ogg_stream_pagein(stream_in, &page);
        if (ret < 0) {
-               ret = E_STREAM_PAGEIN;
+               ret = -E_STREAM_PAGEIN;
                goto err2;
        }
        ret = ogg_stream_packetout(stream_in, &packet);