diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-18 02:21:45 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-18 02:21:45 +0000 |
| commit | 865392451a2ed7db77911e79a58ec80f40b4ab6a (patch) | |
| tree | 9d8791627cae85243464ba8566da741dc8484d7c /apps/app_txtcidname.c | |
| parent | 97027d88cce78f52b44971a3c3e9fe6a5d160c88 (diff) | |
remove unnecessary config file loading
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6812 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_txtcidname.c')
| -rwxr-xr-x | apps/app_txtcidname.c | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c index e8857b5b7..cb88c7e12 100755 --- a/apps/app_txtcidname.c +++ b/apps/app_txtcidname.c @@ -32,13 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/lock.h" -#include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/options.h" -#include "asterisk/config.h" #include "asterisk/module.h" #include "asterisk/enum.h" #include "asterisk/utils.h" @@ -54,11 +51,6 @@ static char *descrip = "the variable 'TXTCIDNAME'. TXTCIDName will either be blank\n" "or return the value found in the TXT record in DNS.\n" ; -#define ENUM_CONFIG "enum.conf" - -static char h323driver[80] = ""; -#define H323DRIVERDEFAULT "H323" - STANDARD_LOCAL_USER; LOCAL_USER_DECL; @@ -96,26 +88,6 @@ static int txtcidname_exec(struct ast_channel *chan, void *data) return res; } -static int load_config(void) -{ - struct ast_config *cfg; - char *s; - - cfg = ast_config_load(ENUM_CONFIG); - if (cfg) { - if (!(s=ast_variable_retrieve(cfg, "general", "h323driver"))) { - ast_copy_string(h323driver, H323DRIVERDEFAULT, sizeof(h323driver)); - } else { - ast_copy_string(h323driver, s, sizeof(h323driver)); - } - ast_config_destroy(cfg); - return 0; - } - ast_log(LOG_NOTICE, "No ENUM Config file, using defaults\n"); - return 0; -} - - int unload_module(void) { STANDARD_HANGUP_LOCALUSERS; @@ -125,21 +97,12 @@ int unload_module(void) int load_module(void) { int res; + res = ast_register_application(app, txtcidname_exec, synopsis, descrip); - if (res) - return(res); - if ((res=load_config())) { - return(res); - } - return(0); -} - -int reload(void) -{ - return(load_config()); + + return res; } - char *description(void) { return tdesc; @@ -156,4 +119,3 @@ char *key() { return ASTERISK_GPL_KEY; } - |