vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Oct 27 18:44:53 2016 +0300| [888f749e186d8c34d896dba6afcf5a159c2bbc08] | committer: Rémi Denis-Courmont
cache: factor common module saving > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=888f749e186d8c34d896dba6afcf5a159c2bbc08 --- src/modules/cache.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/modules/cache.c b/src/modules/cache.c index 5fc8c20..a90fb6a 100644 --- a/src/modules/cache.c +++ b/src/modules/cache.c @@ -575,22 +575,31 @@ error: return -1; } +static int CacheSaveModule(FILE *file, const module_t *module) +{ + SAVE_STRING(module->psz_shortname); + SAVE_STRING(module->psz_longname); + SAVE_STRING(module->psz_help); + SAVE_IMMEDIATE(module->i_shortcuts); + + for (size_t j = 0; j < module->i_shortcuts; j++) + SAVE_STRING(module->pp_shortcuts[j]); + + SAVE_STRING(module->psz_capability); + SAVE_IMMEDIATE(module->i_score); + return 0; +error: + return -1; +} + static int CacheSaveSubmodule( FILE *file, const module_t *p_module ) { if( !p_module ) return 0; if( CacheSaveSubmodule( file, p_module->next ) ) goto error; - - SAVE_STRING( p_module->psz_shortname ); - SAVE_STRING( p_module->psz_longname ); - SAVE_STRING(p_module->psz_help); - SAVE_IMMEDIATE( p_module->i_shortcuts ); - for( unsigned j = 0; j < p_module->i_shortcuts; j++ ) - SAVE_STRING( p_module->pp_shortcuts[j] ); - - SAVE_STRING( p_module->psz_capability ); - SAVE_IMMEDIATE( p_module->i_score ); + if (CacheSaveModule(file, p_module)) + goto error; return 0; error: @@ -626,16 +635,8 @@ static int CacheSaveBank(FILE *file, vlc_plugin_t *const *cache, size_t n) const module_t *module = plugin->module; uint32_t i_submodule; - /* Save additional infos */ - SAVE_STRING(module->psz_shortname); - SAVE_STRING(module->psz_longname); - SAVE_STRING(module->psz_help); - SAVE_IMMEDIATE(module->i_shortcuts); - for (unsigned j = 0; j < module->i_shortcuts; j++) - SAVE_STRING(module->pp_shortcuts[j]); - - SAVE_STRING(module->psz_capability); - SAVE_IMMEDIATE(module->i_score); + if (CacheSaveModule(file, module)) + goto error; i_submodule = module->submodule_count; SAVE_IMMEDIATE( i_submodule ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
