diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-01 20:35:25 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-01 20:35:25 +0000 |
| commit | 073e0e215a6d21fc5c14ce20abb6dfb34693e4b5 (patch) | |
| tree | c711cb21cc504768564353fcb313f41e0aa7eb39 /main/loader.c | |
| parent | 5fec9b8d1f107311ac13f67e742001c46f84c945 (diff) | |
Make mod_load_cmp() not as klunky.
There is a reason the heap comparison functions like qsort(), and other
comparison functions specify <0, >0, and =0 for the return values.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@387209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 |