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

remove unnecessary config file loading

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-10-18 02:21:45 +00:00
parent 4e919f337c
commit ff34fbd02b
1 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/app_txtcidname.c
View File

@@ -32,13 +32,10 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/logger.h" #include "asterisk/logger.h"
#include "asterisk/channel.h" #include "asterisk/channel.h"
#include "asterisk/pbx.h" #include "asterisk/pbx.h"
#include "asterisk/options.h" #include "asterisk/options.h"
#include "asterisk/config.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/enum.h" #include "asterisk/enum.h"
#include "asterisk/utils.h" #include "asterisk/utils.h"
@@ -54,11 +51,6 @@ static char *descrip =
"the variable 'TXTCIDNAME'. TXTCIDName will either be blank\n" "the variable 'TXTCIDNAME'. TXTCIDName will either be blank\n"
"or return the value found in the TXT record in DNS.\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; STANDARD_LOCAL_USER;
LOCAL_USER_DECL; LOCAL_USER_DECL;
@@ -96,26 +88,6 @@ static int txtcidname_exec(struct ast_channel *chan, void *data)
return res; 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) int unload_module(void)
{ {
STANDARD_HANGUP_LOCALUSERS; STANDARD_HANGUP_LOCALUSERS;
@@ -125,21 +97,12 @@ int unload_module(void)
int load_module(void) int load_module(void)
{ {
int res; int res;
res = ast_register_application(app, txtcidname_exec, synopsis, descrip); 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 res;
{
return(load_config());
} }
char *description(void) char *description(void)
{ {
return tdesc; return tdesc;
@@ -156,4 +119,3 @@ char *key()
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }