libaacs | branch: master | npzacs <npz...@gmail.com> | Tue Apr 28 09:58:27 2015 +0300| [67d80d2ecf511b89db16a8534bbf35e6fcc4907d] | committer: npzacs
Cosmetics (move function) > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=67d80d2ecf511b89db16a8534bbf35e6fcc4907d --- src/libaacs/aacs.c | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/libaacs/aacs.c b/src/libaacs/aacs.c index 9c2414a..2ea5e6d 100644 --- a/src/libaacs/aacs.c +++ b/src/libaacs/aacs.c @@ -397,6 +397,38 @@ static AACS_FILE_H *_file_open(AACS *aacs, const char *file) return fp; } +static size_t _read_file(AACS *aacs, const char *file, void **data) +{ + AACS_FILE_H *fp = NULL; + int64_t f_size; + + *data = NULL; + + fp = _file_open(aacs, file); + if (!fp) { + BD_DEBUG(DBG_AACS | DBG_CRIT, "Unable to open %s\n", file); + return 0; + } + + file_seek(fp, 0, SEEK_END); + f_size = file_tell(fp); + file_seek(fp, 0, SEEK_SET); + + *data = malloc(f_size); + if (*data) { + if (file_read(fp, *data, f_size) != f_size) { + BD_DEBUG(DBG_AACS | DBG_CRIT, "Failed reading %s\n", file); + X_FREE(*data); + } + } else { + BD_DEBUG(DBG_AACS | DBG_CRIT, "Out of memory\n"); + } + + file_close(fp); + + return *data ? f_size : 0; +} + static MKB *_mkb_open(AACS *aacs) { AACS_FILE_H *fp; @@ -847,38 +879,6 @@ static int _calc_title_hash(AACS *aacs) return result; } -static size_t _read_file(AACS *aacs, const char *file, void **data) -{ - AACS_FILE_H *fp = NULL; - int64_t f_size; - - *data = NULL; - - fp = _file_open(aacs, file); - if (!fp) { - BD_DEBUG(DBG_AACS | DBG_CRIT, "Unable to open %s\n", file); - return 0; - } - - file_seek(fp, 0, SEEK_END); - f_size = file_tell(fp); - file_seek(fp, 0, SEEK_SET); - - *data = malloc(f_size); - if (*data) { - if (file_read(fp, *data, f_size) != f_size) { - BD_DEBUG(DBG_AACS | DBG_CRIT, "Failed reading %s\n", file); - X_FREE(*data); - } - } else { - BD_DEBUG(DBG_AACS | DBG_CRIT, "Out of memory\n"); - } - - file_close(fp); - - return *data ? f_size : 0; -} - static CONTENT_CERT *_read_cc_any(AACS *aacs) { CONTENT_CERT *cc = NULL; _______________________________________________ libaacs-devel mailing list libaacs-devel@videolan.org https://mailman.videolan.org/listinfo/libaacs-devel
