Changeset 353

Show
Ignore:
Timestamp:
2004-01-03 21:41:15 (5 years ago)
Author:
zen
Message:

Fixed windows binary vs text bug in fopen. Removed warnings by explicit casting.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r346 r353  
    3838#include <sys/types.h> 
    3939#include <sys/stat.h> 
     40 
     41#ifndef WIN32 
    4042#include <unistd.h> 
     43#endif 
     44 
    4145#include <fcntl.h> 
    4246#include <errno.h> 
    …… 
    107111 
    108112  if (flags & OGGZ_WRITE) { 
    109     file = fopen (filename, "w"); 
    110   } else { 
    111     file = fopen (filename, "r"); 
     113    file = fopen (filename, "wb"); 
     114  } else { 
     115    file = fopen (filename, "rb"); 
    112116  } 
    113117  if (file == NULL) return NULL; 
    …… 
    329333 
    330334  do { 
     335 
     336 
     337#ifndef WIN32 
    331338    serialno = random(); 
     339#else 
     340    serialno = rand(); 
     341#endif 
    332342  } while (oggz_get_stream (oggz, serialno) != NULL); 
    333343 

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

    r347 r353  
    4040 
    4141#if OGGZ_CONFIG_READ 
    42  
     42#include <stdlib.h> 
    4343#include <string.h> 
    4444 
    …… 
    145145  if (!op->b_o_s) return 0; 
    146146 
     147 
    147148  tdata = oggz_malloc (sizeof (oggz_theora_metric_t)); 
    148149 

  • liboggz/trunk/src/liboggz/oggz_byteorder.h

    r347 r353  
    3434#define __OGGZ_BYTEORDER_H__ 
    3535 
    36 static __inline__ unsigned short 
     36#ifdef WIN32 
     37#define __INLINE__ __inline 
     38#else 
     39#define __INLINE__ __inline__ 
     40#endif 
     41 
     42static __INLINE__ unsigned short 
    3743_le_16 (unsigned short s) 
    3844{ 
    …… 
    4551} 
    4652 
    47 static __inline__ ogg_uint32_t 
     53static __INLINE__ ogg_uint32_t 
    4854_le_32 (ogg_uint32_t i) 
    4955{ 
    …… 
    5864} 
    5965 
    60 static __inline__ ogg_uint32_t 
     66static __INLINE__ ogg_uint32_t 
    6167_be_32 (ogg_uint32_t i) 
    6268{ 
    …… 
    7177} 
    7278 
    73 static __inline__ ogg_int64_t 
     79static __INLINE__ ogg_int64_t 
    7480_le_64 (ogg_int64_t l) 
    7581{ 

  • liboggz/trunk/src/liboggz/oggz_read.c

    r346 r353  
    3737 */ 
    3838 
     39#ifndef WIN32 
    3940#include "config.h" 
     41#else 
     42#include <config.h> 
     43#endif 
    4044 
    4145#if OGGZ_CONFIG_READ 
    …… 
    4650#include <sys/types.h> 
    4751#include <sys/stat.h> 
     52 
     53#ifndef WIN32 
    4854#include <unistd.h> 
     55#endif 
     56 
    4957#include <fcntl.h> 
    5058#include <errno.h> 
    …… 
    235243      } 
    236244      os = &stream->ogg_stream; 
    237        
     245 
    238246      result = ogg_stream_packetout(os, op); 
    239247 
    …… 
    336344    bytes = MIN (remaining, 4096); 
    337345    buffer = ogg_sync_buffer (&reader->ogg_sync, bytes); 
    338     if ((bytes_read = fread (buffer, 1, bytes, oggz->file)) == 0) { 
     346    if ((bytes_read = (long)fread (buffer, 1, bytes, oggz->file)) == 0) { 
     347                 
    339348      if (ferror (oggz->file)) { 
    340349        return OGGZ_ERR_SYSTEM; 
    …… 
    507516 
    508517      buffer = ogg_sync_buffer (&reader->ogg_sync, CHUNKSIZE); 
    509       if ((bytes = fread (buffer, 1, CHUNKSIZE, oggz->file)) == 0) { 
     518      if ((bytes = (long)fread (buffer, 1, CHUNKSIZE, oggz->file)) == 0) { 
    510519        if (ferror (oggz->file)) { 
    511520          /*oggz_set_error (oggz, OGGZ_ERR_SYSTEM);*/ 
    …… 
    781790  } 
    782791 
     792#ifndef WIN32 
    783793  if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode)) { 
    784794    offset_end = statbuf.st_size; 
    …… 
    787797    return -1; 
    788798  } 
     799#else 
     800        if (statbuf.st_mode & S_IFREG) { 
     801    offset_end = statbuf.st_size; 
     802  } else { 
     803    /*oggz_set_error (oggz, OGGZ_ERR_NOSEEK);*/ 
     804    return -1; 
     805  } 
     806#endif 
    789807 
    790808  if (unit_target == reader->current_unit) { 
    791     return reader->current_unit; 
     809    return (long)reader->current_unit; 
    792810  } 
    793811 
    …… 
    936954  if (offset_at == -1) return -1; 
    937955 
    938   return reader->current_unit; 
     956  return (long)reader->current_unit; 
    939957 
    940958 notfound: 

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

    r346 r353  
    4040#include <sys/types.h> 
    4141#include <sys/stat.h> 
     42#ifndef WIN32 
    4243#include <unistd.h> 
     44#endif 
    4345#include <fcntl.h> 
    4446#include <errno.h> 
    …… 
    452454    nwritten = write (fd, og->header + writer->page_offset, h); 
    453455#else 
    454     nwritten = fwrite (og->header + writer->page_offset, 1, h, oggz->file); 
     456    nwritten = (long)fwrite (og->header + writer->page_offset, 1, h, oggz->file); 
    455457#endif 
    456458    if (nwritten < h) { 
    …… 
    469471                      og->body + (writer->page_offset - og->header_len), b); 
    470472#else 
    471     nwritten = fwrite (og->body + (writer->page_offset - og->header_len), 
     473    nwritten = (long)fwrite (og->body + (writer->page_offset - og->header_len), 
    472474                       1, b, oggz->file); 
    473475#endif 

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

    r346 r353  
    3131*/ 
    3232 
    33 #include "config.h" 
     33#include <config.h> 
    3434 
    3535#include <stdio.h> 
    …… 
    3737#include <string.h> 
    3838#include <ctype.h> 
     39#ifndef WIN32 
    3940#include <inttypes.h> 
     41#endif 
    4042#include <getopt.h> 
    4143#include <errno.h> 
    …… 
    164166read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data) 
    165167{ 
     168#ifdef WIN32 
     169#define PRId64 "I64d" 
     170#endif 
    166171  fprintf (outfile, "%08lx: serialno %010ld, " 
    167172           "granulepos %" PRId64 ", packetno %" PRId64, 
    …… 
    232237    infile = stdin; 
    233238  } else { 
    234     infile = fopen (infilename, "r"); 
     239    infile = fopen (infilename, "rb"); 
    235240  } 
    236241 
    …… 
    309314              exit (1); 
    310315            } else { 
    311               max_bytes = new_size; 
     316              max_bytes = (long)new_size; 
    312317              packet = new_packet; 
    313318              op.packet = packet; 
    …… 
    425430    outfile = stdout; 
    426431  } else { 
    427     outfile = fopen (outfilename, "w"); 
     432    outfile = fopen (outfilename, "wb"); 
    428433    if (outfile == NULL) { 
    429434      fprintf (stderr, "%s: unable to open output file %s\n", 
    …… 
    469474      } 
    470475    } 
    471      
     476 
    472477    while ((n = oggz_read (oggz, 1024)) > 0); 
    473478