Changeset 3790

Timestamp:

2008-11-17 13:34:54 (2 months ago)

Author:

conrad

Message:

remove dead code from oggz_read.c
for ticket:439, reported by Coverity

Files:

• liboggz/trunk/src/liboggz/oggz_read.c (modified) (21 diffs)

liboggz/trunk/src/liboggz/oggz_read.c

@@ -121 +121 @@
-  } else {
-    stream = oggz_get_stream (oggz, serialno);
-#if 0
-    if (stream == NULL) return OGGZ_ERR_BAD_SERIALNO;
-#else
-    if (stream == NULL)
-      stream = oggz_add_stream (oggz, serialno);
-#endif
-
-    stream->read_packet = read_packet;
@@ -155 +151 @@
-  } else {
-    stream = oggz_get_stream (oggz, serialno);
-#if 0
-    if (stream == NULL) return OGGZ_ERR_BAD_SERIALNO;
-#else
-    if (stream == NULL)
-      stream = oggz_add_stream (oggz, serialno);
-#endif
-
-    stream->read_page = read_page;
@@ -170 +162 @@
-
-/*
-get_next_page_7
+read_get_next_page
- *
-
+
+
- *
- * retrieves the next page.
@@ -180 +173 @@
- */
-static oggz_off_t
-get_next_page_7
+read_get_next_page
-{
-  OggzReader * reader = &oggz->x.reader;
-#if _UNMODIFIED
-  char * buffer;
-#endif
-  long bytes = 0, more;
-  oggz_off_t page_offset = 0, ret;
@@ -195 +185 @@
-    if (more == 0) {
-      page_offset = 0;
-#if _UMMODIFIED_
-      buffer = ogg_sync_buffer (&reader->ogg_sync, CHUNKSIZE);
-      if ((bytes = oggz_io_read (oggz, buffer, CHUNKSIZE)) == 0) {
-#if 0
-  if (ferror (oggz->file)) {
-    oggz_set_error (oggz, OGGZ_ERR_SYSTEM);
-    return -1;
-  }
-#endif
-      }
-
-      if (bytes == 0) {
-        return -2;
-      }
-
-      ogg_sync_wrote(&reader->ogg_sync, bytes);
-#else
-      return -2;
-#endif
-    } else if (more < 0) {
-#ifdef DEBUG_VERBOSE
@@ -251 +223 @@
-
-OggzBufferedPacket *
-
-
+ 
+ 
-            OggzReader *reader) {
-
@@ -271 +243 @@
-void
-oggz_read_free_pbuffer_entry(OggzBufferedPacket *p) {
-
+
-  free(p->packet.packet);
-  free(p);
@@ -284 +256 @@
-  if (p->calced_granulepos == -1 && p->stream->last_granulepos != -1) {
-    int content = oggz_stream_get_content(p->oggz, p->serialno);
-
+ 
-      oggz_auto_calculate_gp_backwards(content, p->stream->last_granulepos,
-      p->stream, &(p->packet), p->stream->last_packet);
-
+
-    p->stream->last_granulepos = p->calced_granulepos;
-    p->stream->last_packet = &(p->packet);
@@ -316 +288 @@
-
-  if (p->stream->read_packet) {
-
+ 
-            p->stream->read_user_data);
-  } else if (p->reader->read_packet) {
-
+ 
-            p->reader->read_user_data);
-  }
@@ -405 +377 @@
-
-          stream->packetno++;
-
+
-          /* got a packet.  process it */
-          granulepos = op->granulepos;
-
-          content = oggz_stream_get_content(oggz, serialno);
-
+
-          /*
-           * if we have no metrics for this stream yet, then generate them
-
-
+      
+ 
-          (
-
-
+ 
+ 
-            (oggz->flags & OGGZ_AUTO)
-
+ 
-          {
-            oggz_auto_read_bos_packet (oggz, op, serialno, NULL);
@@ -426 +398 @@
-          /* attempt to determine granulepos for this packet */
-          if (oggz->flags & OGGZ_AUTO) {
-
-
+ 
+ 
-            /* make sure that we accept any "real" gaps in the granulepos
-             */
@@ -437 +409 @@
-          }
-          stream->last_granulepos = reader->current_granulepos;
-
+
-          /* set unit on last packet of page */
-
+ 
-          (
-            (oggz->metric || stream->metric) && reader->current_granulepos != -1
-
+ 
-          {
-            reader->current_unit =
@@ -451 +423 @@
-            oggz_auto_read_comments (oggz, stream, serialno, op);
-          }
-
+
-          if (oggz->flags & OGGZ_AUTO) {
-
+
-            /*
-
+ 
-             * incoming packets in a dlist */
-            if (reader->current_granulepos == -1) {
-              OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
-
+ 
-                                serialno, stream, reader);
-
@@ -477 +449 @@
-
-              /*
-
+ 
-               */
-              stream->last_granulepos = gp_stored;
@@ -483 +455 @@
-              if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
-                OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
-
+ 
-                                serialno, stream, reader);
-
@@ -514 +486 @@
-    if (cb_ret == OGGZ_STOP_OK || cb_ret == OGGZ_STOP_ERR) return cb_ret;
-
-get_next_page_7
+read_get_next_page
-      return OGGZ_READ_EMPTY; /* eof. leave uninitialized */
-
@@ -543 +515 @@
-      oggz_auto_identify_page (oggz, &og, serialno);
-    }
-
+
-    os = &stream->ogg_stream;
-
@@ -567 +539 @@
-    }
-
-#if 0
-    /* bitrate tracking; add the header's bytes here, the body bytes
-       are done by packet above */
-    vf->bittrack+=og.header_len*8;
-#endif
-
-    ogg_stream_pagein(os, &og);
-  }
@@ -602 +568 @@
-  cb_ret = oggz_read_sync (oggz);
-
-#if 0
-  if (cb_ret == OGGZ_READ_EMPTY) {
-    /* If there's nothing to read yet, don't return 0 (eof) */
-    if (reader->current_unit == 0) cb_ret = 0;
-    else {
-#if 0
-      printf ("oggz_read: EMPTY, current_unit %ld != 0\n",
-              reader->current_unit);
-      return 0;
-#endif
-    }
-  }
-#endif
-
-  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK &&
-         bytes_read > 0 && remaining > 0) {
-    bytes = MIN (remaining, CHUNKSIZE);
-    buffer = ogg_sync_buffer (&reader->ogg_sync, bytes);
-
-
-
+
-    if (bytes_read == OGGZ_ERR_SYSTEM) {
-      return OGGZ_ERR_SYSTEM;
@@ -629 +579 @@
-    if (bytes_read > 0) {
-      ogg_sync_wrote (&reader->ogg_sync, bytes_read);
-
+
-      remaining -= bytes_read;
-      nread += bytes_read;
-
+
-      cb_ret = oggz_read_sync (oggz);
-    }
@@ -686 +636 @@
-  cb_ret = oggz_read_sync (oggz);
-
-#if 0
-  if (cb_ret == OGGZ_READ_EMPTY) {
-    /* If there's nothing to read yet, don't return 0 (eof) */
-    if (reader->current_unit == 0) cb_ret = 0;
-    else return 0;
-  }
-#endif
-
-  while (cb_ret != OGGZ_STOP_ERR && cb_ret != OGGZ_STOP_OK  &&
-         /* !oggz->eos && */ remaining > 0) {