[xiph-commits] r3806 - liboggz/trunk/src/tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-11-20 19:37:03 -0800 (Thu, 20 Nov 2008)
New Revision: 3806

Modified:
   liboggz/trunk/src/tools/oggz-rip.c
Log:
oggz-rip: use oggz_stream_get_content_type instead of local ot_identify(),
fix oggz_read() error check


Modified: liboggz/trunk/src/tools/oggz-rip.c
===================================================================
--- liboggz/trunk/src/tools/oggz-rip.c	2008-11-21 03:36:55 UTC (rev 3805)
+++ liboggz/trunk/src/tools/oggz-rip.c	2008-11-21 03:37:03 UTC (rev 3806)
@@ -181,8 +181,7 @@
   stream->streamid = streamid_count++;
   stream->content_type = "unknown";
 
-  ident = ot_page_identify (oggz, og, NULL);
-  if (ident != NULL) stream->content_type = ident;
+  stream->content_type = oggz_stream_get_content_type (oggz, serialno);
    
   if (ordata->verbose)
     fprintf (stderr, 
@@ -257,11 +256,7 @@
 
   oggz_set_read_page (ordata->reader, -1, read_page, ordata);
   
-  while ((n = oggz_read (ordata->reader, READ_SIZE))) {
-
-    if (n <= 0)
-      return n;
-
+  while ((n = oggz_read (ordata->reader, READ_SIZE)) != 0) {
     if (ordata->verbose) {
       fprintf (stderr, "\r Read %li k, wrote %li k ...\r",
 	       (long) (oggz_tell (ordata->reader)/1024),