[asterisk-commits] branch mogorman/asterisk-xmpp r20105 - in /team/mogorman/asterisk-xmpp: chann...

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Fri Apr 14 14:59:31 2006
New Revision: 20105

URL: http://svn.digium.com/view/asterisk?rev=20105&view=rev
Log:
woohoo fixed it

Modified:
    team/mogorman/asterisk-xmpp/channels/chan_jingle.c
    team/mogorman/asterisk-xmpp/res/res_jabber.c

Modified: team/mogorman/asterisk-xmpp/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/channels/chan_jingle.c?rev=20105&r1=20104&r2=20105&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/channels/chan_jingle.c (original)
+++ team/mogorman/asterisk-xmpp/channels/chan_jingle.c Fri Apr 14 14:59:31 2006
@@ -1520,7 +1520,7 @@
 }
 
 /*! \brief Load module into PBX, register channel */
-int load_module()
+static int load_module(void *mod)
 {
 	ast_verbose("step 1\n");
 	ASTOBJ_CONTAINER_INIT(&jingles);
@@ -1556,13 +1556,13 @@
 }
 
 /*! \brief Reload module */
-int reload()
+static int reload()
 {
 	return 0;
 }
 
 /*! \brief Unload the jingle channel from Asterisk */
-int unload_module()
+static int unload_module(void *mod)
 {
 //	struct jingle_pvt *p = NULL;
 	struct aji_client *client = NULL;
@@ -1592,13 +1592,14 @@
 	return usecnt;
 }
 
-const char *key()
+static const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }
 
-const char *description()
+static const char *description()
 {
 	return desc;
 }
 
+STD_MOD(MOD_1, reload, NULL, NULL);

Modified: team/mogorman/asterisk-xmpp/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/res/res_jabber.c?rev=20105&r1=20104&r2=20105&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/res/res_jabber.c (original)
+++ team/mogorman/asterisk-xmpp/res/res_jabber.c Fri Apr 14 14:59:31 2006
@@ -48,8 +48,7 @@
 
 #define JABBER_CONFIG "jabber.conf"
 
-STANDARD_USECOUNT_DECL;
-
+static struct module_symbols *me;
 
 static int aji_highest_bit(int number);
 static void aji_buddy_destroy(struct aji_buddy *obj);
@@ -1645,7 +1644,7 @@
 	return &clients;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	ASTOBJ_CONTAINER_TRAVERSE(&clients,1, {
 			ASTOBJ_RDLOCK(iterator);
@@ -1667,7 +1666,7 @@
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 
 
@@ -1697,20 +1696,14 @@
 	}
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return tdesc;
 }
 
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }
 
+STD_MOD(MOD_0 , NULL, NULL, NULL);