Changeset 5222:539af2614ec9 in roaraudio


Ignore:
Timestamp:
11/12/11 12:29:15 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

removed roar_file_map() and roar_file_unmap()

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/file.h

    r5221 r5222  
    4646ssize_t roar_file_send_raw   (int out, int in) _LIBROAR_ATTR_DEPRECATED; 
    4747 
    48 ssize_t roar_file_map        (char * filename, int flags, mode_t mode, size_t len, void ** mem) _LIBROAR_ATTR_DEPRECATED; 
    49 int     roar_file_unmap      (size_t len, void * mem) _LIBROAR_ATTR_DEPRECATED; 
    50  
    5148char  * roar_cdromdevice     (void); 
    5249 
  • libroar/file.c

    r5221 r5222  
    131131} 
    132132 
    133 ssize_t     roar_file_map        (char * filename, int flags, mode_t mode, size_t len, void ** mem) { 
    134 #ifdef ROAR_HAVE_MMAP 
    135  int fh; 
    136  int mmap_flags = 0; 
    137  struct stat stat; 
    138  
    139  roar_debug_warn_obsolete("roar_file_map", NULL, NULL); 
    140  
    141  if ( mem == NULL || filename == NULL ) 
    142   return -1; 
    143  
    144  *mem = NULL; 
    145  
    146  if ( flags & O_RDWR ) { 
    147   mmap_flags = PROT_READ|PROT_WRITE; 
    148  } else if ( flags & O_WRONLY ) { 
    149   mmap_flags = PROT_WRITE; 
    150  } else { 
    151   mmap_flags = PROT_READ; 
    152  } 
    153  
    154  if ( (fh = open(filename, flags, mode)) == -1 ) { 
    155   return -1; 
    156  } 
    157  
    158  if ( fstat(fh, &stat) == -1 ) { 
    159   close(fh); 
    160   return -1; 
    161  } 
    162  
    163  if ( stat.st_size < len ) { 
    164   if ( ftruncate(fh, len) == -1 ) { 
    165    close(fh); 
    166    return -1; 
    167   } 
    168  } 
    169  
    170  if ( (*mem = mmap(NULL, len, mmap_flags, MAP_SHARED, fh, 0)) == NULL ) { 
    171   close(fh); 
    172   return -1; 
    173  } 
    174  
    175  close(fh); 
    176  
    177  return len; 
    178 #else 
    179 #ifdef ROAR_TARGET_WIN32 
    180  ROAR_ERR("roar_file_map(*): There is no support to fast access files via mmap() within win32, download a real OS..."); 
    181 #endif 
    182  return -1; 
    183 #endif 
    184 } 
    185  
    186 int     roar_file_unmap      (size_t len, void * mem) { 
    187  roar_debug_warn_obsolete("roar_file_unmap", NULL, NULL); 
    188  
    189 #ifdef ROAR_HAVE_MMAP 
    190  return munmap(mem, len); 
    191 #else 
    192 #ifdef ROAR_TARGET_WIN32 
    193  ROAR_ERR("roar_file_map(*): There is no support to fast access files via mmap() within win32, download a real OS..."); 
    194 #endif 
    195  return -1; 
    196 #endif 
    197 } 
    198  
    199  
    200133char  * roar_cdromdevice     (void) { 
    201134 char * k; 
Note: See TracChangeset for help on using the changeset viewer.