libaacs | branch: master | npzacs <[email protected]> | Wed May 6 13:33:37 2015 +0300| [98b269ad30ca1b23caaea3bcf15491f77d679545] | committer: npzacs
Remove unused cache_get_or_update() > http://git.videolan.org/gitweb.cgi/libaacs.git/?a=commit;h=98b269ad30ca1b23caaea3bcf15491f77d679545 --- src/file/keydbcfg.c | 36 ------------------------------------ src/file/keydbcfg.h | 2 -- 2 files changed, 38 deletions(-) diff --git a/src/file/keydbcfg.c b/src/file/keydbcfg.c index 1665ad5..0373bbb 100644 --- a/src/file/keydbcfg.c +++ b/src/file/keydbcfg.c @@ -534,42 +534,6 @@ int cache_remove(const char *name) return result; } -void *cache_get_or_update(const char *type, const void *data, uint32_t *len, uint32_t version) -{ - uint32_t cache_len, cache_version; - uint8_t *cache_data = NULL; - - /* get cache version */ - cache_get(type, &cache_version, &cache_len, NULL); - - /* if cached data is later, use it */ - if (cache_len && cache_version > version) { - cache_data = malloc(cache_len); - - if (cache_get(type, &cache_version, &cache_len, cache_data)) { - BD_DEBUG(DBG_AACS, "Using cached %s. Version: %d\n", type, cache_version); - *len = cache_len; - return cache_data; - } - - /* read failed, fall back to older version */ - X_FREE(cache_data); - } - - if (data) { - cache_data = malloc(*len); - memcpy(cache_data, data, *len); - - /* cached data is older, update cache */ - if (cache_version < version) { - cache_save(type, version, data, *len); - BD_DEBUG(DBG_AACS, "Updated cached %s. Version: %d\n", type, version); - } - } - - return cache_data; -} - int config_save(const char *name, const void *data, uint32_t len) { char *path = NULL; diff --git a/src/file/keydbcfg.h b/src/file/keydbcfg.h index fd350c9..c4975c5 100644 --- a/src/file/keydbcfg.h +++ b/src/file/keydbcfg.h @@ -131,8 +131,6 @@ BD_PRIVATE int cache_get(const char *name, uint32_t *version, uint32_t *len, voi BD_PRIVATE int cache_save(const char *name, uint32_t version, const void *data, uint32_t len); BD_PRIVATE int cache_remove(const char *name); -BD_PRIVATE void *cache_get_or_update(const char *type, const void *data, uint32_t *len, uint32_t version); - BD_PRIVATE int config_get(const char *name, uint32_t *len, void *buf); /* use buf=NULL to get size */ BD_PRIVATE int config_save(const char *name, const void *data, uint32_t len); _______________________________________________ libaacs-devel mailing list [email protected] https://mailman.videolan.org/listinfo/libaacs-devel
