3 files changed, 22 insertions, 30 deletions
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 3ce99ec12..9150e5773 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -311,12 +311,12 @@ static int csv_log(struct ast_cdr *cdr)
 	return 0;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	if (mf)
 		fclose(mf);
@@ -324,7 +324,7 @@ int unload_module(void)
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	int res;
 	
@@ -339,18 +339,15 @@ int load_module(void)
 	return res;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	load_config();
 	return 0;
 }
 
-int usecount(void)
-{
-	return 0;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index 100db6c07..6aad620d8 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -137,12 +137,12 @@ static int custom_log(struct ast_cdr *cdr)
 	return 0;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	if (mf)
 		fclose(mf);
@@ -150,7 +150,7 @@ int unload_module(void)
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	int res = 0;
 
@@ -164,17 +164,15 @@ int load_module(void)
 	return res;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	return load_config(1);
 }
 
-int usecount(void)
-{
-	return 0;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
+
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index ed99a5690..c24130df7 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -135,18 +135,18 @@ static int manager_log(struct ast_cdr *cdr)
 	return 0;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return desc;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	ast_cdr_unregister(name);
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	int res;
 
@@ -161,18 +161,15 @@ int load_module(void)
 	return res;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	loadconfigurationfile();
 	return 0;
 }
 
-int usecount(void)
-{
-	return 0;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);