[xiph-commits] r3877 - in liboggz/trunk: include/oggz src/liboggz

[conrad at svn.annodex.net]

Author: conrad
Date: 2009-03-16 05:54:27 -0700 (Mon, 16 Mar 2009)
New Revision: 3877

Modified:
   liboggz/trunk/include/oggz/oggz_read.h
   liboggz/trunk/src/liboggz/oggz.c
Log:
Don't map all errors to OGGZ_ERR_STOP_ERR
Required for Mozilla bug 481933
Exposes detected HOLE_IN_DATA as return value from oggz_read(), oggz_read_input(),
+ add documentation for extra return values

Modified: liboggz/trunk/include/oggz/oggz_read.h
===================================================================
--- liboggz/trunk/include/oggz/oggz_read.h	2009-03-11 08:24:03 UTC (rev 3876)
+++ liboggz/trunk/include/oggz/oggz_read.h	2009-03-16 12:54:27 UTC (rev 3877)
@@ -158,6 +158,7 @@
  * returning OGGZ_STOP_OK
  * \retval OGGZ_ERR_STOP_ERR Reading was stopped by a user callback
  * returning OGGZ_STOP_ERR
+ * \retval OGGZ_ERR_HOLE_IN_DATA Hole (sequence number gap) detected in input data
  * \retval OGGZ_ERR_OUT_OF_MEMORY Out of memory
  */
 long oggz_read (OGGZ * oggz, long n);
@@ -174,6 +175,8 @@
  * returning OGGZ_STOP_OK
  * \retval OGGZ_ERR_STOP_ERR Reading was stopped by a user callback
  * returning OGGZ_STOP_ERR
+ * \retval OGGZ_ERR_HOLE_IN_DATA Hole (sequence number gap) detected in input data
+ * \retval OGGZ_ERR_OUT_OF_MEMORY Out of memory
  */
 long oggz_read_input (OGGZ * oggz, unsigned char * buf, long n);
 

Modified: liboggz/trunk/src/liboggz/oggz.c
===================================================================
--- liboggz/trunk/src/liboggz/oggz.c	2009-03-11 08:24:03 UTC (rev 3876)
+++ liboggz/trunk/src/liboggz/oggz.c	2009-03-16 12:54:27 UTC (rev 3877)
@@ -634,7 +634,7 @@
   case OGGZ_STOP_ERR:
     return OGGZ_ERR_STOP_ERR;
   default:
-    return OGGZ_ERR_STOP_ERR;
+    return cb_ret;
   }
 }