Changeset 3791
- Timestamp:
- 2008-11-17 13:34:59 (2 months ago)
- Files:
-
- liboggz/trunk/src/liboggz/oggz_seek.c (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
liboggz/trunk/src/liboggz/oggz_seek.c
r3787 r3791 231 231 #endif 232 232 return -2; 233 #if 0234 } else if (oggz->file && feof (oggz->file)) {235 #ifdef DEBUG_VERBOSE236 printf ("get_next_page: feof (oggz->file), returning -2\n");237 #endif238 clearerr (oggz->file);239 return -2;240 #endif241 233 } 242 234 … … 615 607 oggz_seek_set (OGGZ * oggz, ogg_int64_t unit_target) 616 608 { 617 OggzReader * reader ;609 OggzReader * reader = &oggz->x.reader; 618 610 oggz_off_t offset_orig, offset_at, offset_guess; 619 611 oggz_off_t offset_begin, offset_end = -1, offset_next; … … 641 633 return -1; 642 634 } 643 644 reader = &oggz->x.reader;645 635 646 636 if (unit_target == reader->current_unit) { … … 826 816 oggz_seek (OGGZ * oggz, oggz_off_t offset, int whence) 827 817 { 828 OggzReader * reader ;818 OggzReader * reader = &oggz->x.reader; 829 819 ogg_int64_t units = -1; 830 820 … … 836 826 837 827 if (offset == 0 && whence == SEEK_SET) units = 0; 838 839 reader = &oggz->x.reader; 840 828 841 829 if (!(offset == 0 && whence == SEEK_CUR)) { 842 830 /* Invalidate current_unit */ … … 850 838 oggz_seek_units (OGGZ * oggz, ogg_int64_t units, int whence) 851 839 { 852 OggzReader * reader ;840 OggzReader * reader = &oggz->x.reader; 853 841 854 842 ogg_int64_t r; … … 874 862 return -1; 875 863 } 876 877 reader = &oggz->x.reader;878 864 879 865 switch (whence) {