[asterisk-commits] trunk r19189 - /trunk/res/

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Tue Apr 11 05:01:00 2006
New Revision: 19189

URL: http://svn.digium.com/view/asterisk?rev=19189&view=rev
Log:
normalize code in preparation to module changes


Modified:
    trunk/res/res_agi.c
    trunk/res/res_clioriginate.c
    trunk/res/res_config_odbc.c
    trunk/res/res_config_pgsql.c
    trunk/res/res_convert.c
    trunk/res/res_crypto.c

Modified: trunk/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_agi.c?rev=19189&r1=19188&r2=19189&view=diff
==============================================================================
--- trunk/res/res_agi.c (original)
+++ trunk/res/res_agi.c Tue Apr 11 05:01:00 2006
@@ -70,8 +70,6 @@
 
 /* Recycle some stuff from the CLI interface */
 #define fdprintf agi_debug_cli
-
-static char *tdesc = "Asterisk Gateway Interface (AGI)";
 
 static char *app = "AGI";
 
@@ -2053,7 +2051,8 @@
 
 const char *description(void)
 {
-	return tdesc;
+	return "Asterisk Gateway Interface (AGI)";
+
 }
 
 int usecount(void)
@@ -2063,7 +2062,7 @@
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: trunk/res/res_clioriginate.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_clioriginate.c?rev=19189&r1=19188&r2=19189&view=diff
==============================================================================
--- trunk/res/res_clioriginate.c (original)
+++ trunk/res/res_clioriginate.c Tue Apr 11 05:01:00 2006
@@ -43,8 +43,6 @@
 #define TIMEOUT 30
 
 STANDARD_USECOUNT_DECL;
-
-static char *tdesc = "Call origination from the CLI";
 
 static char orig_help[] = 
 "  There are two ways to use this command. A call can be originated between a\n"
@@ -177,7 +175,8 @@
 
 const char *description(void)
 {
-	return tdesc;
+	return "Call origination from the CLI";
+
 }
 
 int usecount(void)
@@ -185,7 +184,7 @@
 	return 0;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: trunk/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_odbc.c?rev=19189&r1=19188&r2=19189&view=diff
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Tue Apr 11 05:01:00 2006
@@ -47,8 +47,6 @@
 #include "asterisk/options.h"
 #include "asterisk/res_odbc.h"
 #include "asterisk/utils.h"
-
-static char *tdesc = "ODBC Configuration";
 
 LOCAL_USER_DECL;
 
@@ -527,7 +525,8 @@
 
 const char *description(void)
 {
-	return tdesc;
+	return "ODBC Configuration";
+
 }
 
 int usecount (void)
@@ -536,7 +535,7 @@
 	return 1;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: trunk/res/res_config_pgsql.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_config_pgsql.c?rev=19189&r1=19188&r2=19189&view=diff
==============================================================================
--- trunk/res/res_config_pgsql.c (original)
+++ trunk/res/res_config_pgsql.c Tue Apr 11 05:01:00 2006
@@ -40,8 +40,6 @@
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/cli.h"
-
-static char *res_config_pgsql_desc = "Postgresql RealTime Configuration Driver";
 
 AST_MUTEX_DEFINE_STATIC(pgsql_lock);
 
@@ -695,7 +693,8 @@
 
 const char *description(void)
 {
-	return res_config_pgsql_desc;
+	return "Postgresql RealTime Configuration Driver";
+
 }
 
 int usecount(void)
@@ -709,7 +708,7 @@
 	return 0;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: trunk/res/res_convert.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_convert.c?rev=19189&r1=19188&r2=19189&view=diff
==============================================================================
--- trunk/res/res_convert.c (original)
+++ trunk/res/res_convert.c Tue Apr 11 05:01:00 2006
@@ -40,8 +40,6 @@
 #include "asterisk/file.h"
 
 STANDARD_USECOUNT_DECL;
-
-static char *desc = "File format conversion CLI command";
 
 /*! \brief Split the filename to basename and extension */
 static int split_ext(char *filename, char **name, char **ext)
@@ -146,19 +144,18 @@
 
 const char *description(void)
 {
-	return desc;
+	return "File format conversion CLI command";
+
 }
 
 int usecount(void)
 {
 	int res;
-	
 	STANDARD_USECOUNT(res);
-
 	return res;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: trunk/res/res_crypto.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_crypto.c?rev=19189&r1=19188&r2=19189&view=diff
==============================================================================
--- trunk/res/res_crypto.c (original)
+++ trunk/res/res_crypto.c Tue Apr 11 05:01:00 2006
@@ -614,7 +614,7 @@
 	return 1;
 }
 
-const char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }