normalize code preparing for loader changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-11 15:19:34 +00:00
parent 68b136c263
commit 7ba1b92a04
9 changed files with 18 additions and 32 deletions

View File

@@ -49,8 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h" #include "asterisk/utils.h"
#include "asterisk/lock.h" #include "asterisk/lock.h"
static char *tdesc = "Asterisk ADSI Programming Application";
static char *app = "ADSIProg"; static char *app = "ADSIProg";
static char *synopsis = "Load Asterisk ADSI Scripts into phone"; static char *synopsis = "Load Asterisk ADSI Scripts into phone";
@@ -1588,7 +1586,7 @@ int load_module(void)
const char *description(void) const char *description(void)
{ {
return tdesc; return "Asterisk ADSI Programming Application";
} }
int usecount(void) int usecount(void)
@@ -1598,7 +1596,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -68,8 +68,6 @@ struct event_node{
typedef struct event_node event_node_t; typedef struct event_node event_node_t;
static char *tdesc = "Alarm Receiver for Asterisk";
static char *app = "AlarmReceiver"; static char *app = "AlarmReceiver";
static char *synopsis = "Provide support for receving alarm reports from a burglar or fire alarm panel"; static char *synopsis = "Provide support for receving alarm reports from a burglar or fire alarm panel";
@@ -839,7 +837,7 @@ int load_module(void)
const char *description(void) const char *description(void)
{ {
return tdesc; return "Alarm Receiver for Asterisk";
} }
int usecount(void) int usecount(void)
@@ -849,7 +847,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/app.h" #include "asterisk/app.h"
static char *tdesc = "Answering Machine Detection Application";
static char *app = "AMD"; static char *app = "AMD";
static char *synopsis = "Attempts to detect answering machines"; static char *synopsis = "Attempts to detect answering machines";
static char *descrip = static char *descrip =
@@ -413,7 +412,7 @@ int reload(void)
const char *description(void) const char *description(void)
{ {
return tdesc; return "Answering Machine Detection Application";
} }
int usecount(void) int usecount(void)
@@ -423,7 +422,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -62,7 +62,6 @@ AST_APP_OPTIONS(auth_app_options, {
AST_APP_OPTION('r', OPT_REMOVE), AST_APP_OPTION('r', OPT_REMOVE),
}); });
static char *tdesc = "Authentication Application";
static char *app = "Authenticate"; static char *app = "Authenticate";
@@ -254,7 +253,7 @@ int load_module(void)
const char *description(void) const char *description(void)
{ {
return tdesc; return "Authentication Application";
} }
int usecount(void) int usecount(void)
@@ -264,7 +263,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -48,8 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/devicestate.h" #include "asterisk/devicestate.h"
#include "asterisk/options.h" #include "asterisk/options.h"
static char *tdesc = "Check channel availability";
static char *app = "ChanIsAvail"; static char *app = "ChanIsAvail";
static char *synopsis = "Check channel availability"; static char *synopsis = "Check channel availability";
@@ -175,7 +173,7 @@ int load_module(void)
const char *description(void) const char *description(void)
{ {
return tdesc; return "Check channel availability";
} }
int usecount(void) int usecount(void)
@@ -185,7 +183,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/app.h" #include "asterisk/app.h"
#include "asterisk/features.h" #include "asterisk/features.h"
static char *tdesc = "Channel Redirect";
static char *app = "ChannelRedirect"; static char *app = "ChannelRedirect";
static char *synopsis = "Redirects given channel to a dialplan target."; static char *synopsis = "Redirects given channel to a dialplan target.";
static char *descrip = static char *descrip =
@@ -139,7 +138,7 @@ int load_module(void)
const char *description(void) const char *description(void)
{ {
return tdesc; return "Channel Redirect";
} }
int usecount(void) int usecount(void)
@@ -151,7 +150,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -44,8 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/utils.h" #include "asterisk/utils.h"
#include "asterisk/options.h" #include "asterisk/options.h"
static const char *tdesc = "Control Playback Application";
static const char *app = "ControlPlayback"; static const char *app = "ControlPlayback";
static const char *synopsis = "Play a file with fast forward and rewind"; static const char *synopsis = "Play a file with fast forward and rewind";
@@ -174,7 +172,7 @@ int load_module(void)
const char *description(void) const char *description(void)
{ {
return (char *) tdesc; return "Control Playback Application";
} }
int usecount(void) int usecount(void)
@@ -185,7 +183,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -48,8 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/options.h" #include "asterisk/options.h"
static char *tdesc = "Database Access Functions";
static char *d_descrip = static char *d_descrip =
" DBdel(family/key): This applicaiton will delete a key from the Asterisk\n" " DBdel(family/key): This applicaiton will delete a key from the Asterisk\n"
"database.\n"; "database.\n";
@@ -169,7 +167,7 @@ int load_module(void)
const char *description(void) const char *description(void)
{ {
return tdesc; return "Database Access Functions";
} }
int usecount(void) int usecount(void)
@@ -179,7 +177,7 @@ int usecount(void)
return res; return res;
} }
const char *key() const char *key(void)
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

View File

@@ -61,8 +61,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/privacy.h" #include "asterisk/privacy.h"
#include "asterisk/stringfields.h" #include "asterisk/stringfields.h"
static char *tdesc = "Dialing Application";
static char *app = "Dial"; static char *app = "Dial";
static char *synopsis = "Place a call and connect to the current channel"; static char *synopsis = "Place a call and connect to the current channel";
@@ -1730,7 +1728,8 @@ STATIC_MODULE int load_module(void)
STATIC_MODULE const char *description(void) STATIC_MODULE const char *description(void)
{ {
return tdesc; return "Dialing Application";
} }
STATIC_MODULE int usecount(void) STATIC_MODULE int usecount(void)