diff options
Diffstat (limited to 'main/loader.c')
| -rw-r--r-- | main/loader.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/main/loader.c b/main/loader.c index c82c7e608..cf53eda99 100644 --- a/main/loader.c +++ b/main/loader.c @@ -993,16 +993,17 @@ static int mod_load_cmp(void *a, void *b) { struct ast_module *a_mod = (struct ast_module *) a; struct ast_module *b_mod = (struct ast_module *) b; - int res = -1; - /* if load_pri is not set, default is 128. Lower is better*/ - unsigned char a_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? a_mod->info->load_pri : 128; - unsigned char b_pri = ast_test_flag(b_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 128; - if (a_pri == b_pri) { - res = 0; - } else if (a_pri < b_pri) { - res = 1; - } - return res; + /* if load_pri is not set, default is 128. Lower is better */ + int a_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? a_mod->info->load_pri : 128; + int b_pri = ast_test_flag(b_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 128; + + /* + * Returns comparison values for a min-heap + * <0 a_pri > b_pri + * =0 a_pri == b_pri + * >0 a_pri < b_pri + */ + return b_pri - a_pri; } /*! loads modules in order by load_pri, updates mod_count |