dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Use defined return values in load_module in more places. 

(closes issue #11096)
Patches:
      pbx_config.c.patch uploaded by moy (license 222)
      pbx_dundi.c.patch uploaded by moy (license 222)
      pbx_gtkconsole.c.patch uploaded by moy (license 222)
      pbx_loopback.c.patch uploaded by moy (license 222)
      pbx_realtime.c.patch uploaded by moy (license 222)
      pbx_spool.c.patch uploaded by moy (license 222)
      app_adsiprog.c.patch uploaded by moy (license 222)
      app_alarmreceiver.c.patch uploaded by moy (license 222)
      app_amd.c.patch uploaded by moy (license 222)
      app_authenticate.c.patch uploaded by moy (license 222)
      app_cdr.c.patch uploaded by moy (license 222)
      app_zapateller.c.patch uploaded by moy (license 222)
      app_zapbarge.c.patch uploaded by moy (license 222)
      app_zapras.c.patch uploaded by moy (license 222)
      app_zapscan.c.patch uploaded by moy (license 222)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@94806 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
qwell 2007-12-26 20:02:27 +00:00
parent 4d04a3258e
commit df53774db6
15 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_adsiprog.c
View File

@ -1573,7 +1573,9 @@ static int unload_module(void)
static int load_module(void)
{
return ast_register_application(app, adsi_exec, synopsis, descrip);
if (ast_register_application(app, adsi_exec, synopsis, descrip))
return AST_MODULE_LOAD_FAILURE;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Asterisk ADSI Programming Application");

7
apps/app_alarmreceiver.c
View File

@ -801,8 +801,11 @@ static int unload_module(void)
static int load_module(void)
{
if(load_config())
return ast_register_application(app, alarmreceiver_exec, synopsis, descrip);
if(load_config()) {
if (ast_register_application(app, alarmreceiver_exec, synopsis, descrip))
return AST_MODULE_LOAD_FAILURE;
return AST_MODULE_LOAD_SUCCESS;
}
else
return AST_MODULE_LOAD_DECLINE;
}

20
apps/app_amd.c
View File

@ -308,7 +308,7 @@ static int amd_exec(struct ast_channel *chan, void *data)
return 0;
}
static void load_config(int reload)
static int load_config(int reload)
{
struct ast_config *cfg = NULL;
char *cat = NULL;
@ -317,9 +317,9 @@ static void load_config(int reload)
if (!(cfg = ast_config_load("amd.conf", config_flags))) {
ast_log(LOG_ERROR, "Configuration file amd.conf missing.\n");
return;
return -1;
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return;
return 0;
cat = ast_category_browse(cfg, NULL);
@ -360,7 +360,7 @@ static void load_config(int reload)
dfltInitialSilence, dfltGreeting, dfltAfterGreetingSilence, dfltTotalAnalysisTime,
dfltMinimumWordLength, dfltBetweenWordsSilence, dfltMaximumNumberOfWords, dfltSilenceThreshold );
return;
return 0;
}
static int unload_module(void)
@ -370,14 +370,18 @@ static int unload_module(void)
static int load_module(void)
{
load_config(0);
return ast_register_application(app, amd_exec, synopsis, descrip);
if (load_config(0))
return AST_MODULE_LOAD_DECLINE;
if (ast_register_application(app, amd_exec, synopsis, descrip))
return AST_MODULE_LOAD_FAILURE;
return AST_MODULE_LOAD_SUCCESS;
}
static int reload(void)
{
load_config(1);
return 0;
if (load_config(1))
return AST_MODULE_LOAD_DECLINE;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Answering Machine Detection Application",

4
apps/app_authenticate.c
View File

@ -204,7 +204,9 @@ static int unload_module(void)
static int load_module(void)
{
return ast_register_application(app, auth_exec, synopsis, descrip);
if (ast_register_application(app, auth_exec, synopsis, descrip))
return AST_MODULE_LOAD_FAILURE;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Authentication Application");

4
apps/app_cdr.c
View File

@ -55,7 +55,9 @@ static int unload_module(void)
static int load_module(void)
{
return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip);
if (ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip))
return AST_MODULE_LOAD_FAILURE;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Tell Asterisk to not maintain a CDR for the current call");

2
apps/app_zapateller.c
View File

@ -107,7 +107,7 @@ static int unload_module(void)
static int load_module(void)
{
return ast_register_application(app, zapateller_exec, synopsis, descrip);
return ((ast_register_application(app, zapateller_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Block Telemarketers with Special Information Tone");

2
apps/app_zapbarge.c
View File

@ -293,7 +293,7 @@ static int unload_module(void)
static int load_module(void)
{
return ast_register_application(app, conf_exec, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Barge in on Zap channel application");

2
apps/app_zapras.c
View File

@ -231,7 +231,7 @@ static int unload_module(void)
static int load_module(void)
{
return ast_register_application(app, zapras_exec, synopsis, descrip);
return ((ast_register_application(app, zapras_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Zaptel ISDN Remote Access Server");

2
apps/app_zapscan.c
View File

@ -356,7 +356,7 @@ static int unload_module(void)
static int load_module(void)
{
return ast_register_application(app, conf_exec, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Scan Zap channels application");

7
pbx/pbx_config.c
View File

@ -1639,7 +1639,7 @@ static int pbx_load_module(void)
pbx_set_autofallthrough(autofallthrough_config);
pbx_set_extenpatternmatchnew(extenpatternmatchnew_config);
return 0;
return AST_MODULE_LOAD_SUCCESS;
}
static int load_module(void)
@ -1651,15 +1651,14 @@ static int load_module(void)
ast_cli_register(&cli_dialplan_save);
ast_cli_register_multiple(cli_pbx_config, sizeof(cli_pbx_config) / sizeof(struct ast_cli_entry));
return 0;
return AST_MODULE_LOAD_SUCCESS;
}
static int reload(void)
{
if (clearglobalvars_config)
pbx_builtin_clear_globals();
pbx_load_module();
return 0;
return pbx_load_module();
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Text Extension Configuration",

4
pbx/pbx_dundi.c
View File

@ -4779,9 +4779,9 @@ static int reload(void)
struct sockaddr_in sin;
if (set_config("dundi.conf", &sin, 1))
return -1;
return AST_MODULE_LOAD_FAILURE;
return 0;
return AST_MODULE_LOAD_SUCCESS;
}
static int load_module(void)

6
pbx/pbx_gtkconsole.c
View File

@ -230,7 +230,7 @@ static int reload_module(void *mod)
}
}
return 0;
return AST_MODULE_LOAD_SUCCESS;
}
static void file_ok_sel(GtkWidget *w, GtkFileSelection *fs)
@ -473,7 +473,7 @@ static int load_module(void *mod)
{
if (pipe(clipipe)) {
ast_log(LOG_WARNING, "Unable to create CLI pipe\n");
return -1;
return AST_MODULE_LOAD_FAILURE;
}
g_thread_init(NULL);
if (gtk_init_check(NULL, NULL)) {
@ -489,7 +489,7 @@ static int load_module(void *mod)
else
ast_verb(2, "GTK is not available -- skipping monitor\n");
}
return 0;
return AST_MODULE_LOAD_SUCCESS;
}
static const char *description(void)

5
pbx/pbx_loopback.c
View File

@ -168,8 +168,9 @@ static int unload_module(void)
static int load_module(void)
{
ast_register_switch(&loopback_switch);
return 0;
if (ast_register_switch(&loopback_switch))
return AST_MODULE_LOAD_FAILURE;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Loopback Switch");

5
pbx/pbx_realtime.c
View File

@ -243,8 +243,9 @@ static int unload_module(void)
static int load_module(void)
{
ast_register_switch(&realtime_switch);
return 0;
if (ast_register_switch(&realtime_switch))
return AST_MODULE_LOAD_FAILURE;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Realtime Switch");

6
pbx/pbx_spool.c
View File

@ -494,16 +494,16 @@ static int load_module(void)
snprintf(qdir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing");
if (ast_mkdir(qdir, 0777)) {
ast_log(LOG_WARNING, "Unable to create queue directory %s -- outgoing spool disabled\n", qdir);
return 0;
return AST_MODULE_LOAD_DECLINE;
}
snprintf(qdonedir, sizeof(qdir), "%s/%s", ast_config_AST_SPOOL_DIR, "outgoing_done");
if ((ret = ast_pthread_create_detached_background(&thread, NULL, scan_thread, NULL))) {
ast_log(LOG_WARNING, "Unable to create thread :( (returned error: %d)\n", ret);
return -1;
return AST_MODULE_LOAD_FAILURE;
}
return 0;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Outgoing Spool Support");