Changeset 2608

Show
Ignore:
Timestamp:
2007-02-27 22:48:01 (2 years ago)
Author:
laser13
Message:

Single oggz_off_t public type for large file support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • liboggz/trunk/configure.ac

    r2600 r2608  
    257257AC_CHECK_SIZEOF(ssize_t,4) 
    258258 
    259 AC_DEFINE_UNQUOTED([oggz_off_t], ${TYPEOF_OGGZ_OFF_T}, [Configured type of oggz_off_t]) 
     259dnl was defined to set oggz_off_t type (removed by laser13) 
     260dnl AC_DEFINE_UNQUOTED([oggz_off_t], ${TYPEOF_OGGZ_OFF_T}, [Configured type of oggz_off_t]) 
    260261 
    261262 
    …… 
    368369include/Makefile 
    369370include/oggz/Makefile 
     371include/oggz/oggz_off_t.h 
    370372src/Makefile 
    371373src/liboggz/Version_script 

  • liboggz/trunk/include/oggz/Makefile.am

    r2563 r2608  
    44oggzincludedir = $(includedir)/oggz 
    55oggzinclude_HEADERS = oggz.h oggz_comments.h oggz_constants.h oggz_read.h \ 
    6         oggz_seek.h oggz_write.h oggz_io.h oggz_table.h oggz_deprecated.h 
     6        oggz_seek.h oggz_write.h oggz_io.h oggz_table.h oggz_deprecated.h \ 
     7        oggz_off_t.h 
    78 

  • liboggz/trunk/include/oggz/oggz.h

    r2563 r2608  
    552552long oggz_serialno_new (OGGZ * oggz); 
    553553 
     554/* define appropriate type for oggz_off_t */ 
     555#ifdef _WIN32 
     556#include <oggz/oggz_off_t_win32.h> 
     557#else 
     558#include <oggz/oggz_off_t.h> 
     559#endif 
     560 
    554561#include <oggz/oggz_comments.h> 
    555562#include <oggz/oggz_read.h> 

  • liboggz/trunk/include/oggz/oggz_seek.h

    r2567 r2608  
    130130 * descriptor. 
    131131 */ 
    132 off_t oggz_tell (OGGZ * oggz); 
     132oggz_off_t oggz_tell (OGGZ * oggz); 
    133133 
    134134/** 
    …… 
    139139 * \returns the new file offset, or -1 on failure. 
    140140 */ 
    141 off_t oggz_seek (OGGZ * oggz, loff_t offset, int whence); 
     141oggz_off_t oggz_seek (OGGZ * oggz, oggz_off_t offset, int whence); 
    142142 
    143143#ifdef _UNIMPLEMENTED 
    …… 
    444444 * \returns 0 on success, -1 on failure. 
    445445 */ 
    446 int oggz_set_data_start (OGGZ * oggz, off_t offset); 
     446int oggz_set_data_start (OGGZ * oggz, oggz_off_t offset); 
    447447/** \} 
    448448 */ 

  • liboggz/trunk/src/liboggz/Makefile.am

    r2564 r2608  
    2121        oggz_table.c \ 
    2222        oggz_vector.c oggz_vector.h \ 
    23         metric_internal.c  
     23        metric_internal.c 
    2424 
    2525liboggz_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@ 

  • liboggz/trunk/src/liboggz/oggz.c

    r2563 r2608  
    217217} 
    218218 
    219 off_t 
     219oggz_off_t 
    220220oggz_tell (OGGZ * oggz) 
    221221{ 

  • liboggz/trunk/src/liboggz/oggz_comments.c

    r2592 r2608  
    4141 
    4242/*#define DEBUG*/ 
     43 
     44#ifdef WIN32                                                                    
     45#define strcasecmp _stricmp 
     46#endif 
     47 
    4348 
    4449static char * 

  • liboggz/trunk/src/liboggz/oggz_private.h

    r2563 r2608  
    4040#include <oggz/oggz_constants.h> 
    4141 
     42/* define appropriate type for oggz_off_t */ 
     43#ifdef _WIN32 
     44#include <oggz/oggz_off_t_win32.h> 
     45#else 
     46#include <oggz/oggz_off_t.h> 
     47#endif 
     48 
    4249#include "oggz_macros.h" 
    4350#include "oggz_vector.h" 
     51 
    4452 
    4553typedef struct _OGGZ OGGZ; 
    …… 
    136144 
    137145#if 0 
    138   off_t offset_page_end; /* offset of end of current page */ 
     146  oggz_off_t offset_page_end; /* offset of end of current page */ 
    139147#endif 
    140148}; 
    …… 
    216224  ogg_page current_page; 
    217225 
    218   off_t offset; /* offset of current page start */ 
    219   off_t offset_data_begin; /* offset of unit 0 page start */ 
     226  oggz_off_t offset; /* offset of current page start */ 
     227  oggz_off_t offset_data_begin; /* offset of unit 0 page start */ 
    220228 
    221229  long run_blocksize; /* blocksize to use for oggz_run() */ 

  • liboggz/trunk/src/liboggz/oggz_seek.c

    r2106 r2608  
    146146 
    147147#ifdef DEBUG 
    148   printf ("reset to %ld\n", offset_at); 
     148  printf ("reset to %" PRI_OGGZ_OFF_T "d\n", offset_at); 
    149149#endif 
    150150 
    …… 
    314314#ifdef DEBUG 
    315315 
    316     printf ("get_prev_start_page: [A] offset_at: @%ld\toffset_start: @%ld\n", 
     316    printf ("get_prev_start_page: [A] offset_at: @%" PRI_OGGZ_OFF_T "d\toffset_start: @%" PRI_OGGZ_OFF_T "d\n", 
    317317            offset_at, offset_start); 
    318318 
    319     printf ("get_prev_start_page: seeked to %ld\n", offset_start); 
     319    printf ("get_prev_start_page: seeked to %" PRI_OGGZ_OFF_T "d\n", offset_start); 
    320320#endif 
    321321 
    …… 
    340340 
    341341#ifdef DEBUG_VERBOSE 
    342       printf ("get_prev_start_page: GOT page (%lld) @%ld\tat @%ld\n", 
     342      printf ("get_prev_start_page: GOT page (%lld) @%" PRI_OGGZ_OFF_T "d\tat @%" PRI_OGGZ_OFF_T  "d\n", 
    343343              granule_at, page_offset, offset_at); 
    344344#endif 
    …… 
    356356 
    357357#ifdef DEBUG 
    358     printf ("get_prev_start_page: [B] offset_at: @%ld\toffset_start: @%ld\n" 
    359             "found_offset: @%ld\tpage_offset: @%ld\n", 
     358    printf ("get_prev_start_page: [B] offset_at: @%" PRI_OGGZ_OFF_T "d\toffset_start: @%" PRI_OGGZ_OFF_T "d\n" 
     359            "found_offset: @%" PRI_OGGZ_OFF_T "d\tpage_offset: @%" PRI_OGGZ_OFF_T "d\n", 
    360360            offset_at, offset_start, found_offset, page_offset); 
    361361#endif 
    …… 
    369369 
    370370#ifdef DEBUG 
    371     printf ("get_prev_start_page: [C] offset_at: @%ld\t" 
    372             "found_offset: @%ld\tunit_at: %lld\n", 
     371    printf ("get_prev_start_page: [C] offset_at: @%" PRI_OGGZ_OFF "d\t" 
     372            "found_offset: @%" PRO_OGGZ_OFF "d\tunit_at: %lld\n", 
    373373            offset_at, found_offset, unit_at); 
    374374#endif 
    …… 
    393393 
    394394#ifdef DEBUG 
    395   printf (" SCANNING from %ld...", offset_begin); 
     395  printf (" SCANNING from %" PRI_OGGZ_OFF_T "d...", offset_begin); 
    396396#endif 
    397397 
    …… 
    401401 
    402402#ifdef DEBUG 
    403     printf (" scan @%ld\n", offset_at); 
     403    printf (" scan @%" PRI_OGGZ_OFF_T "d\n", offset_at); 
    404404#endif 
    405405 
    …… 
    541541 
    542542#ifdef DEBUG 
    543     printf ("oggz_seek_guess: guessed %ld\n", offset_guess); 
     543    printf ("oggz_seek_guess: guessed %" PRI_OGGZ_OFF_T "d\n", offset_guess); 
    544544#endif 
    545545 
    …… 
    568568      offset_end = statbuf.st_size; 
    569569#ifdef DEBUG 
    570       printf ("oggz_offset_end: stat size %ld\n", offset_end); 
     570      printf ("oggz_offset_end: stat size %" PRI_OGGZ_OFF_T "d\n", offset_end); 
    571571#endif 
    572572    } else { 
    …… 
    660660 
    661661#ifdef DEBUG 
    662     printf ("oggz_seek_set: [A] want u%lld: (u%lld - u%lld) [@%ld - @%ld]\n", 
     662    printf ("oggz_seek_set: [A] want u%lld: (u%lld - u%lld) [@%" PRI_OGGZ_OFF_T "d - @%" PRI_OGGZ_OFF_T "d]\n", 
    663663            unit_target, unit_begin, unit_end, offset_begin, offset_end); 
    664664#endif 
    …… 
    683683 
    684684#ifdef DEBUG 
    685     printf ("oggz_seek_set: offset_next %ld\n", offset_next); 
     685    printf ("oggz_seek_set: offset_next %" PRI_OGGZ_OFF_T "d\n", offset_next); 
    686686#endif 
    687687 
    …… 
    692692      unit_end = oggz_get_unit (oggz, serialno, granule_at); 
    693693#ifdef DEBUG 
    694       printf ("oggz_seek_set: [C] offset_next @%ld, g%lld, (s%ld)\n", 
     694      printf ("oggz_seek_set: [C] offset_next @%" PRI_OGGZ_OFF_T "d, g%lld, (s%ld)\n", 
    695695              offset_next, granule_at, serialno); 
    696696      printf ("oggz_seek_set: [c] u%lld\n", 
    …… 
    727727 
    728728#ifdef DEBUG 
    729     printf ("oggz_seek_set: [D] want u%lld, got page u%lld @%ld g%lld\n", 
     729    printf ("oggz_seek_set: [D] want u%lld, got page u%lld @%" PRI_OGGZ_OFF_T "d g%lld\n", 
    730730            unit_target, unit_at, offset_at, granule_at); 
    731731#endif 
    …… 
    799799 
    800800#ifdef DEBUG 
    801   printf ("*** oggz_seek_end: found packet (%lld) at @%ld [%lld]\n", 
     801  printf ("*** oggz_seek_end: found packet (%lld) at @%" PRI_OGGZ_OFF_T "d [%lld]\n", 
    802802          unit_end, offset_end, granulepos); 
    803803#endif 

  • liboggz/trunk/win32/config.h

    r2114 r2608  
    132132/* Define to `unsigned' if <sys/types.h> does not define. */ 
    133133#undef size_t 
    134  
    135 /* Defined type of oggz_off_t */ 
    136 #define oggz_off_t off_t