kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modules: Fix issues with CLI completion.

Browse Source 
* Stop using ast_module_helper to check if a module is loaded, use
  ast_module_check instead (app_confbridge and app_meetme).
* Stop ast_module_helper from listing reload classes when needsreload
  was not requested.

ASTERISK-27378

Change-Id: Iaed8c1e4fcbeb242921dbac7929a0fe75ff4b239
This commit is contained in:
Corey Farrell
2017-10-30 01:32:32 -04:00
parent 2a898460db
commit e82b921c35
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/loader.c
View File

@@ -708,8 +708,9 @@ char *ast_module_helper(const char *line, const char *word, int pos, int state,
int i, which=0, l = strlen(word);
char *ret = NULL;
if (pos != rpos)
if (pos != rpos) {
return NULL;
}
AST_DLLIST_LOCK(&module_list);
AST_DLLIST_TRAVERSE(&module_list, cur, entry) {
@@ -722,10 +723,11 @@ char *ast_module_helper(const char *line, const char *word, int pos, int state,
}
AST_DLLIST_UNLOCK(&module_list);
if (!ret) {
if (!ret && needsreload) {
for (i=0; !ret && reload_classes[i].name; i++) {
if (!strncasecmp(word, reload_classes[i].name, l) && ++which > state)
if (!strncasecmp(word, reload_classes[i].name, l) && ++which > state) {
ret = ast_strdup(reload_classes[i].name);
}
}
}