Changeset 3204

Show
Ignore:
Timestamp:
2007-08-28 03:35:45 (1 year ago)
Author:
shans
Message:

Getting everything to actually compile again

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • liboggz/trunk/configure.ac

    r3198 r3204  
    293293dnl changequote(,)dnl 
    294294if test "x$ac_cv_prog_gcc" = xyes ; then 
    295   CFLAGS="$CFLAGS -Wall -Wextra -g -std=gnu99 -Wdeclaration-after-statement" 
     295  CFLAGS="$CFLAGS -Wall -Wextra -g -std=gnu99 -Wdeclaration-after-statement -Wno-unused" 
    296296fi 
    297297dnl changequote([,])dnl 

  • liboggz/trunk/src/liboggz/oggz_auto.c

    r2955 r3204  
    849849  {"\177FLAC", 4, "Flac", auto_flac, auto_calc_flac}, 
    850850  {"AnxData", 7, "AnxData", auto_anxdata, NULL}, 
    851   {"", 0, "Unknown", NULL} 
     851  {"", 0, "Unknown", NULL, NULL} 
    852852};  
    853853 

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

    r3175 r3204  
    9898 
    9999int 
    100 oggz_seek_reset_stream(void *data, void *arg) { 
    101   ((oggz_stream_t *)data)->last_granulepos = (int)arg; 
     100oggz_seek_reset_stream(void *data) { 
     101  ((oggz_stream_t *)data)->last_granulepos = -1L; 
    102102  return 0; 
    103103} 
    …… 
    119119  ogg_sync_reset (&reader->ogg_sync); 
    120120 
    121   oggz_vector_foreach1(oggz->streams, oggz_seek_reset_stream, (void *)-1); 
     121  oggz_vector_foreach(oggz->streams, oggz_seek_reset_stream); 
    122122   
    123123  return offset_at; 

  • liboggz/trunk/src/liboggz/oggz_write.c

    r2960 r3204  
    261261    if (op->bytes < 0) return OGGZ_ERR_BAD_BYTES; 
    262262    if (!suffix && b_o_s != stream->b_o_s) return OGGZ_ERR_BAD_B_O_S; 
    263  
    264263    if (op->granulepos != -1 && op->granulepos < stream->granulepos) 
    265264      return OGGZ_ERR_BAD_GRANULEPOS; 
    …… 
    581580{ 
    582581  OggzWriter * writer = &oggz->x.writer; 
    583   oggz_writer_packet_t * zpacket, * next_zpacket; 
     582  oggz_writer_packet_t * zpacket, * next_zpacket = NULL; 
    584583  int cb_ret = 0; 
    585584 

  • liboggz/trunk/src/tests/io-read-single.c

    r2956 r3204  
    137137  read_called++; 
    138138 
    139   len = MIN (n, bytes_generated - offset); 
     139  len = MIN ((int)n, bytes_generated - offset); 
    140140 
    141141  memcpy (buf, &data_buf[offset], len); 

  • liboggz/trunk/src/tests/io-read.c

    r2956 r3204  
    135135  read_called++; 
    136136 
    137   len = MIN (n, DATA_BUF_LEN - offset); 
     137  len = MIN ((int)n, DATA_BUF_LEN - offset); 
    138138  memcpy (buf, &data_buf[offset], len); 
    139139 

  • liboggz/trunk/src/tests/io-seek.c

    r2956 r3204  
    144144  read_called++; 
    145145 
    146   len = MIN (n, offset_end - my_offset); 
     146  len = MIN ((int)n, offset_end - my_offset); 
    147147  memcpy (buf, &data_buf[my_offset], len); 
    148148 

  • liboggz/trunk/src/tests/io-write-flush.c

    r2956 r3204  
    145145  write_called++; 
    146146 
    147   len = MIN (n, DATA_BUF_LEN - write_offset); 
     147  len = MIN ((int)n, DATA_BUF_LEN - write_offset); 
    148148  memcpy (&data_buf[write_offset], buf, len); 
    149149 

  • liboggz/trunk/src/tests/io-write.c

    r2956 r3204  
    135135  write_called++; 
    136136 
    137   len = MIN (n, DATA_BUF_LEN - offset); 
     137  len = MIN ((int)n, DATA_BUF_LEN - offset); 
    138138  memcpy (&data_buf[offset], buf, len); 
    139139 

  • liboggz/trunk/src/tools/oggzrip.c

    r2955 r3204  
    206206{ 
    207207  int n = fwrite (data, size, count, stream); 
    208   if (n != count) { 
     208  if ((size_t)n != count) { 
    209209    perror ("write failed"); 
    210210    exit (1); 

  • liboggz/trunk/src/tools/skeleton.c

    r2512 r3204  
    108108    fishead_packet fp; 
    109109 
     110    /* 
    110111    if (memcmp(op->packet, FISHEAD_IDENTIFIER, 8)) 
    111         ; /* invalid packet what do we do? */ 
    112  
     112          ; invalid packet what do we do?  
     113    */ 
     114     
    113115    fp.version_major = *((ogg_uint16_t*)(op->packet+8)); /* version major */ 
    114116    fp.version_minor = *((ogg_uint16_t*)(op->packet+10)); /* version minor */ 
    …… 
    127129    fisbone_packet fp; 
    128130     
     131    /* 
    129132    if (memcmp(op->packet, FISBONE_IDENTIFIER, 8)) 
    130         ; /* invalid value, what do we do? */ 
     133          ; invalid value, what do we do?  
     134    */ 
    131135    fp.serial_no = *((ogg_uint32_t*)(op->packet+12)); /* serialno of the stream represented by this fisbone packet */ 
    132136    fp.nr_header_packet = *((ogg_uint32_t*)(op->packet+16)); /* number of header packets */