more module loader related fixes

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

3 files changed, 22 insertions, 43 deletions

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 438d5267b..139a1e76a 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -176,7 +176,7 @@ static int pgsql_log(struct ast_cdr *cdr)
 	return 0;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
@@ -326,34 +326,25 @@ static int my_load_module(void)
 	return res;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	return my_load_module();
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	return my_unload_module();
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	my_unload_module();
 	return my_load_module();
 }
 
-int usecount(void)
-{
-	/* To be able to unload the module */
-	if ( ast_mutex_trylock(&pgsql_lock) ) {
-		return 1;
-	} else {
-		ast_mutex_unlock(&pgsql_lock);
-		return 0;
-	}
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_0, reload, NULL, NULL);
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 6da03982e..1982c7dd0 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -164,12 +164,12 @@ static int sqlite_log(struct ast_cdr *cdr)
 }
 
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	if (db)
 		sqlite_close(db);
@@ -177,7 +177,7 @@ int unload_module(void)
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	char *zErr;
 	char fn[PATH_MAX];
@@ -218,17 +218,14 @@ err:
 	return -1;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	return 0;
 }
 
-int usecount(void)
-{
-	return 0;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_0, reload, NULL, NULL);
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index 7563543e9..2a812a180 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 2004 - 2005, Digium, Inc.
+ * Copyright (C) 2004 - 2006, Digium, Inc.
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
@@ -293,7 +293,7 @@ static void get_date(char *dateField, struct timeval tv)
 	}
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
@@ -499,34 +499,25 @@ static int tds_load_module(void)
 	return res;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	tds_unload_module();
 	return tds_load_module();
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	return tds_load_module();
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	return tds_unload_module();
 }
 
-int usecount(void)
-{
-	/* Simplistic use count */
-	if (ast_mutex_trylock(&tds_lock)) {
-		return 1;
-	} else {
-		ast_mutex_unlock(&tds_lock);
-		return 0;
-	}
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_0, reload, NULL, NULL);