[svn-commits] branch oej/test-this-branch r33031 - /team/oej/test-this-branch/funcs/

[svn-commits at lists.digium.com]

Author: oej
Date: Thu Jun  8 07:05:05 2006
New Revision: 33031

URL: http://svn.digium.com/view/asterisk?rev=33031&view=rev
Log:
Update to current trunk module API

Modified:
    team/oej/test-this-branch/funcs/func_module.c

Modified: team/oej/test-this-branch/funcs/func_module.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/funcs/func_module.c?rev=33031&r1=33030&r2=33031&view=diff
==============================================================================
--- team/oej/test-this-branch/funcs/func_module.c (original)
+++ team/oej/test-this-branch/funcs/func_module.c Thu Jun  8 07:05:05 2006
@@ -2,6 +2,7 @@
  * Asterisk -- An open source telephony toolkit.
  *
  * Copyright (C) 1999 - 2006, Digium, Inc.
+ * and Edvina AB, Sollentuna, Sweden.
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
@@ -20,15 +21,15 @@
  * \author Olle E. Johansson, Edvina.net
  */
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
@@ -66,27 +67,24 @@
 
 static char *tdesc = "Checks if Asterisk module is loaded in memory";
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	return ast_custom_function_unregister(&ifmodule_function);
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	return ast_custom_function_register(&ifmodule_function);
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return tdesc;
 }
 
-int usecount(void)
-{
-	return 0;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT, NULL, NULL, NULL);