LOAD_STRING( pp_cache[i]->p_module->psz_shortname );
LOAD_STRING( pp_cache[i]->p_module->psz_longname );
LOAD_STRING( pp_cache[i]->p_module->psz_help );
- for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
- {
- LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
- }
+
+ LOAD_IMMEDIATE( pp_cache[i]->p_module->i_shortcuts );
+ pp_cache[i]->p_module->pp_shortcuts =
+ malloc( sizeof( char ** ) * pp_cache[i]->p_module->i_shortcuts );
+ for( j = 0; j < pp_cache[i]->p_module->i_shortcuts; j++ )
+ LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] );
+
LOAD_STRING( pp_cache[i]->p_module->psz_capability );
LOAD_IMMEDIATE( pp_cache[i]->p_module->i_score );
LOAD_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
LOAD_STRING( p_module->psz_shortname );
LOAD_STRING( p_module->psz_longname );
LOAD_STRING( p_module->psz_help );
- for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
- {
- LOAD_STRING( p_module->pp_shortcuts[j] ); // FIX
- }
+
+ LOAD_IMMEDIATE( p_module->i_shortcuts );
+ p_module->pp_shortcuts = malloc( sizeof( char ** ) * p_module->i_shortcuts );
+ for( j = 0; j < p_module->i_shortcuts; j++ )
+ LOAD_STRING( p_module->pp_shortcuts[j] );
+
LOAD_STRING( p_module->psz_capability );
LOAD_IMMEDIATE( p_module->i_score );
LOAD_IMMEDIATE( p_module->b_unloadable );
SAVE_STRING( pp_cache[i]->p_module->psz_shortname );
SAVE_STRING( pp_cache[i]->p_module->psz_longname );
SAVE_STRING( pp_cache[i]->p_module->psz_help );
- for (unsigned j = 0; j < MODULE_SHORTCUT_MAX; j++)
- {
- SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
- }
+ SAVE_IMMEDIATE( pp_cache[i]->p_module->i_shortcuts );
+ for (unsigned j = 0; j < pp_cache[i]->p_module->i_shortcuts; j++)
+ SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] );
+
SAVE_STRING( pp_cache[i]->p_module->psz_capability );
SAVE_IMMEDIATE( pp_cache[i]->p_module->i_score );
SAVE_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
SAVE_STRING( p_module->psz_shortname );
SAVE_STRING( p_module->psz_longname );
SAVE_STRING( p_module->psz_help );
- for( unsigned j = 0; j < MODULE_SHORTCUT_MAX; j++ )
- SAVE_STRING( p_module->pp_shortcuts[j] ); // FIXME
+ 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 );