Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv1895/apps
Modified Files:
app_txtcidname.c
Log Message:
remove unnecessary config file loading
Index: app_txtcidname.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_txtcidname.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- app_txtcidname.c 14 Sep 2005 20:46:49 -0000 1.16
+++ app_txtcidname.c 18 Oct 2005 02:21:45 -0000 1.17
@@ -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 @@
"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 @@
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 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 @@
{
return ASTERISK_GPL_KEY;
}
-
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
