X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=94383c4564156cb7f608c9eaa9a7b6b5e8846614;hp=6a66b8e38c2c3d199b2a12443fca07aaf59d4acc;hb=a7a37b282c4e936b2fb34c2bd7423f9f800dfd44;hpb=33713473b1051c2d9f487c66a92a5cbdf1277ce3

diff --git a/ogg_afh.c b/ogg_afh.c
index 6a66b8e3..94383c45 100644
--- 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);