normalize code preparing for loader changes

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@19220 f38db490-d61c-443f-a65b-d21fe96a405b

9 files changed, 18 insertions, 32 deletions

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 71cfb6940..0ac46181f 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -49,8 +49,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 
-static char *tdesc = "Asterisk ADSI Programming Application";
-
 static char *app = "ADSIProg";
 
 static char *synopsis = "Load Asterisk ADSI Scripts into phone";
@@ -1588,7 +1586,7 @@ int load_module(void)
 
 const char *description(void)
 {
-	return tdesc;
+	return "Asterisk ADSI Programming Application";
 }
 
 int usecount(void)
@@ -1598,7 +1596,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 4389edecd..e26845886 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -68,8 +68,6 @@ struct event_node{
 
 typedef struct event_node event_node_t;
 
-static char *tdesc = "Alarm Receiver for Asterisk";
-
 static char *app = "AlarmReceiver";
 
 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)
 {
-	return tdesc;
+	return "Alarm Receiver for Asterisk";
 }
 
 int usecount(void)
@@ -849,7 +847,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 54cd21af4..c054b2abf 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -35,7 +35,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 
 
-static char *tdesc = "Answering Machine Detection Application";
 static char *app = "AMD";
 static char *synopsis = "Attempts to detect answering machines";
 static char *descrip =
@@ -413,7 +412,7 @@ int reload(void)
 
 const char *description(void)
 {
-	return tdesc;
+	return "Answering Machine Detection Application";
 }
 
 int usecount(void)
@@ -423,7 +422,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index f6bb42ece..259789747 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -62,7 +62,6 @@ AST_APP_OPTIONS(auth_app_options, {
 	AST_APP_OPTION('r', OPT_REMOVE),
 });
 
-static char *tdesc = "Authentication Application";
 
 static char *app = "Authenticate";
 
@@ -254,7 +253,7 @@ int load_module(void)
 
 const char *description(void)
 {
-	return tdesc;
+	return "Authentication Application";
 }
 
 int usecount(void)
@@ -264,7 +263,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 138028ce6..847cfc114 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -48,8 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/devicestate.h"
 #include "asterisk/options.h"
 
-static char *tdesc = "Check channel availability";
-
 static char *app = "ChanIsAvail";
 
 static char *synopsis = "Check channel availability";
@@ -175,7 +173,7 @@ int load_module(void)
 
 const char *description(void)
 {
-	return tdesc;
+	return "Check channel availability";
 }
 
 int usecount(void)
@@ -185,7 +183,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index 2849768a5..f527b7d38 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.c
@@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/features.h"
 
-static char *tdesc = "Channel Redirect";
 static char *app = "ChannelRedirect";
 static char *synopsis = "Redirects given channel to a dialplan target.";
 static char *descrip = 
@@ -139,7 +138,7 @@ int load_module(void)
 
 const char *description(void)
 {
-	return tdesc;
+	return "Channel Redirect";
 }
 
 int usecount(void)
@@ -151,7 +150,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 415d61b56..5d70cc452 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -44,8 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/options.h"
 
-static const char *tdesc = "Control Playback Application";
-
 static const char *app = "ControlPlayback";
 
 static const char *synopsis = "Play a file with fast forward and rewind";
@@ -174,7 +172,7 @@ int load_module(void)
 
 const char *description(void)
 {
-	return (char *) tdesc;
+	return "Control Playback Application";
 }
 
 int usecount(void)
@@ -185,7 +183,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_db.c b/apps/app_db.c
index 963eaaa77..38b7c6ade 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -48,8 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
 
-static char *tdesc = "Database Access Functions";
-
 static char *d_descrip =
 "  DBdel(family/key): This applicaiton will delete a key from the Asterisk\n"
 "database.\n";
@@ -169,7 +167,7 @@ int load_module(void)
 
 const char *description(void)
 {
-	return tdesc;
+	return "Database Access Functions";
 }
 
 int usecount(void)
@@ -179,7 +177,7 @@ int usecount(void)
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
diff --git a/apps/app_dial.c b/apps/app_dial.c
index b77547d88..d4bd80f0a 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -61,8 +61,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/privacy.h"
 #include "asterisk/stringfields.h"
 
-static char *tdesc = "Dialing Application";
-
 static char *app = "Dial";
 
 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)
 {
-	return tdesc;
+	return "Dialing Application";
+
 }
 
 STATIC_MODULE int usecount(void)