Changeset 5222:539af2614ec9 in roaraudio

Timestamp:

11/12/11 12:29:15 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

removed roar_file_map() and roar_file_unmap()

Files:

• include/libroar/file.h (modified) (1 diff)
• libroar/file.c (modified) (1 diff)

include/libroar/file.h

@@ -46 +46 @@
 ssize_t roar_file_send_raw   (int out, int in) _LIBROAR_ATTR_DEPRECATED;
 
-ssize_t roar_file_map        (char * filename, int flags, mode_t mode, size_t len, void ** mem) _LIBROAR_ATTR_DEPRECATED;
-int     roar_file_unmap      (size_t len, void * mem) _LIBROAR_ATTR_DEPRECATED;
-
 char  * roar_cdromdevice     (void);
 

libroar/file.c

@@ -131 +131 @@
 }
 
-ssize_t     roar_file_map        (char * filename, int flags, mode_t mode, size_t len, void ** mem) {
-#ifdef ROAR_HAVE_MMAP
- int fh;
- int mmap_flags = 0;
- struct stat stat;
-
- roar_debug_warn_obsolete("roar_file_map", NULL, NULL);
-
- if ( mem == NULL || filename == NULL )
-  return -1;
-
- *mem = NULL;
-
- if ( flags & O_RDWR ) {
-  mmap_flags = PROT_READ|PROT_WRITE;
- } else if ( flags & O_WRONLY ) {
-  mmap_flags = PROT_WRITE;
- } else {
-  mmap_flags = PROT_READ;
- }
-
- if ( (fh = open(filename, flags, mode)) == -1 ) {
-  return -1;
- }
-
- if ( fstat(fh, &stat) == -1 ) {
-  close(fh);
-  return -1;
- }
-
- if ( stat.st_size < len ) {
-  if ( ftruncate(fh, len) == -1 ) {
-   close(fh);
-   return -1;
-  }
- }
-
- if ( (*mem = mmap(NULL, len, mmap_flags, MAP_SHARED, fh, 0)) == NULL ) {
-  close(fh);
-  return -1;
- }
-
- close(fh);
-
- return len;
-#else
-#ifdef ROAR_TARGET_WIN32
- ROAR_ERR("roar_file_map(*): There is no support to fast access files via mmap() within win32, download a real OS...");
-#endif
- return -1;
-#endif
-}
-
-int     roar_file_unmap      (size_t len, void * mem) {
- roar_debug_warn_obsolete("roar_file_unmap", NULL, NULL);
-
-#ifdef ROAR_HAVE_MMAP
- return munmap(mem, len);
-#else
-#ifdef ROAR_TARGET_WIN32
- ROAR_ERR("roar_file_map(*): There is no support to fast access files via mmap() within win32, download a real OS...");
-#endif
- return -1;
-#endif
-}
-
-
 char  * roar_cdromdevice     (void) {
  char * k;