libaacs | branch: master | npzacs <npz...@gmail.com> | Fri Jan 16 13:48:41 2015 +0200| [e79812c42df8dd4c0f6cf756e7b45cb56a07471f] | committer: npzacs
Remove unused code > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=e79812c42df8dd4c0f6cf756e7b45cb56a07471f --- src/file/file.h | 2 -- src/file/file_posix.c | 20 ++++---------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/file/file.h b/src/file/file.h index aee102d..834dbef 100644 --- a/src/file/file.h +++ b/src/file/file.h @@ -33,9 +33,7 @@ #define file_close(X) X->close(X) #define file_seek(X,Y,Z) X->seek(X,Y,Z) #define file_tell(X) X->tell(X) -#define file_eof(X) X->eof(X) #define file_read(X,Y,Z) X->read(X,Y,Z) -#define file_write(X,Y,Z) X->write(X,Y,Z) AACS_PRIVATE extern AACS_FILE_H *(*file_open)(const char* filename, const char *mode); diff --git a/src/file/file_posix.c b/src/file/file_posix.c index 445f611..f10956b 100644 --- a/src/file/file_posix.c +++ b/src/file/file_posix.c @@ -62,33 +62,21 @@ static int64_t file_tell_linux(AACS_FILE_H *file) #endif } -static int file_eof_linux(AACS_FILE_H *file) -{ - return feof((FILE *)file->internal); -} - static int64_t file_read_linux(AACS_FILE_H *file, uint8_t *buf, int64_t size) { return fread(buf, 1, size, (FILE *)file->internal); } -static int64_t file_write_linux(AACS_FILE_H *file, const uint8_t *buf, int64_t size) -{ - return fwrite(buf, 1, size, (FILE *)file->internal); -} - static AACS_FILE_H *file_open_linux(const char* filename, const char *mode) { FILE *fp = NULL; - AACS_FILE_H *file = malloc(sizeof(AACS_FILE_H)); + AACS_FILE_H *file = calloc(1, sizeof(AACS_FILE_H)); DEBUG(DBG_FILE, "Opening LINUX file %s... (%p)\n", filename, (void*)file); file->close = file_close_linux; file->seek = file_seek_linux; file->read = file_read_linux; - file->write = file_write_linux; file->tell = file_tell_linux; - file->eof = file_eof_linux; if ((fp = fopen(filename, mode))) { file->internal = fp; @@ -107,7 +95,7 @@ AACS_FILE_H* (*file_open)(const char* filename, const char *mode) = file_open_li AACS_FILE_OPEN aacs_register_file(AACS_FILE_OPEN p) { - AACS_FILE_OPEN old = file_open; - file_open = p; - return old; + AACS_FILE_OPEN old = file_open; + file_open = p; + return old; } _______________________________________________ libaacs-devel mailing list libaacs-devel@videolan.org https://mailman.videolan.org/listinfo/libaacs-devel
