remove remaining Zaptel references in various places

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-07-28 16:42:00 +00:00
parent 06d951f585
commit 6291cd19bf
14 changed files with 32 additions and 306 deletions

View File

@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h"
static char *app = "DAHDIBarge";
static char *deprecated_app = "ZapBarge";
static char *synopsis = "Barge in (monitor) DAHDI channel";
@@ -287,12 +286,6 @@ out:
return res;
}
static int conf_exec_warn(struct ast_channel *chan, void *data)
{
ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
return conf_exec(chan, data);
}
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -300,7 +293,6 @@ static int unload_module(void)
static int load_module(void)
{
ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}

View File

@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/app.h"
static char *app = "DAHDIRAS";
static char *deprecated_app = "ZapRAS";
static char *synopsis = "Executes DAHDI ISDN RAS application";
@@ -212,12 +211,6 @@ static int dahdiras_exec(struct ast_channel *chan, void *data)
return res;
}
static int dahdiras_exec_warn(struct ast_channel *chan, void *data)
{
ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
return dahdiras_exec(chan, data);
}
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -225,7 +218,6 @@ static int unload_module(void)
static int load_module(void)
{
ast_register_application(deprecated_app, dahdiras_exec_warn, synopsis, descrip);
return ((ast_register_application(app, dahdiras_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}

View File

@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/options.h"
static char *app = "DAHDIScan";
static char *deprecated_app = "ZapScan";
static char *synopsis = "Scan DAHDI channels to monitor calls";
@@ -357,12 +356,6 @@ static int conf_exec(struct ast_channel *chan, void *data)
return res;
}
static int conf_exec_warn(struct ast_channel *chan, void *data)
{
ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
return conf_exec(chan, data);
}
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -370,7 +363,6 @@ static int unload_module(void)
static int load_module(void)
{
ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}

View File

@@ -95,7 +95,7 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data)
timeout = atoi(args.timeout) * 1000;
if (ast_strlen_zero(args.dial)) {
ast_log(LOG_WARNING, "PARK: A dial resource must be specified i.e: Console/dsp or Zap/g1/5551212\n");
ast_log(LOG_WARNING, "PARK: A dial resource must be specified i.e: Console/dsp or DAHDI/g1/5551212\n");
return -1;
}