[NeoStats-Devel] [Commits] r360 - branches/3.0

Author: Fish
Date: Tue Aug  9 20:11:26 2005
New Revision: 360

Modified:
   branches/3.0/OnJoinBot.c
   branches/3.0/SecureServ.c
   branches/3.0/SecureServ.h
   branches/3.0/update.c
Log:
fix AddTimer Calls

Modified: branches/3.0/OnJoinBot.c
==============================================================================
--- branches/3.0/OnJoinBot.c	(original)
+++ branches/3.0/OnJoinBot.c	Tue Aug  9 20:11:26 2005
@@ -266,7 +266,7 @@
 	return NULL;
 }
 
-int MonBotCycle()
+int MonBotCycle( void *userptr )
 {
 	lnode_t *mcnode;
 	Channel *c;
@@ -296,7 +296,7 @@
 	return NS_SUCCESS;
 }
 
-int JoinNewChan() 
+int JoinNewChan (void *userptr) 
 {
 	Channel *c;
 	BotInfo *nickname = NULL;
@@ -853,7 +853,7 @@
 int ss_cmd_cycle(CmdParams *cmdparams)
 {
 	SET_SEGV_LOCATION();
-	JoinNewChan();
+	JoinNewChan( NULL );
 	return NS_SUCCESS;
 }
 

Modified: branches/3.0/SecureServ.c
==============================================================================
--- branches/3.0/SecureServ.c	(original)
+++ branches/3.0/SecureServ.c	Tue Aug  9 20:11:26 2005
@@ -139,7 +139,7 @@
 	{
 		if( SecureServ.DoOnJoin )
 		{
-			AddTimer( TIMER_TYPE_INTERVAL, JoinNewChan, "JoinNewChan", SecureServ.stayinchantime );
+			AddTimer( TIMER_TYPE_INTERVAL, JoinNewChan, "JoinNewChan", SecureServ.stayinchantime, NULL );
 		}
 		else
 		{
@@ -154,7 +154,7 @@
 	{
 		if( SecureServ.monchancycle )
 		{
-			AddTimer( TIMER_TYPE_INTERVAL, MonBotCycle, "MonBotCycle", SecureServ.monchancycletime );
+			AddTimer( TIMER_TYPE_INTERVAL, MonBotCycle, "MonBotCycle", SecureServ.monchancycletime, NULL );
 		}
 		else
 		{
@@ -432,13 +432,13 @@
 	srand( hash_count( GetChannelHash() ) );
 	/* kick of the autojoin timer */
 	if( SecureServ.DoOnJoin )
-		AddTimer( TIMER_TYPE_INTERVAL, JoinNewChan, "JoinNewChan", SecureServ.stayinchantime );
+		AddTimer( TIMER_TYPE_INTERVAL, JoinNewChan, "JoinNewChan", SecureServ.stayinchantime, NULL );
 	if( SecureServ.monchancycle )
-		AddTimer( TIMER_TYPE_INTERVAL, MonBotCycle, "MonBotCycle", SecureServ.monchancycletime );
+		AddTimer( TIMER_TYPE_INTERVAL, MonBotCycle, "MonBotCycle", SecureServ.monchancycletime, NULL );
 
 	if ((SecureServ.updateuname[0] != 0) && (SecureServ.updatepw[0] != 0)) {
-         	AutoUpdate();
-		AddTimer( TIMER_TYPE_INTERVAL, AutoUpdate, "AutoUpdate", SecureServ.autoupgradetime );
+         	AutoUpdate( NULL );
+		AddTimer( TIMER_TYPE_INTERVAL, AutoUpdate, "AutoUpdate", SecureServ.autoupgradetime, NULL );
 	} else if (SecureServ.autoupgrade == 1) {
 		irc_chanalert (ss_bot, "No valid Username/Password configured for SecureServ Dat File Update");
 	}

Modified: branches/3.0/SecureServ.h
==============================================================================
--- branches/3.0/SecureServ.h	(original)
+++ branches/3.0/SecureServ.h	Tue Aug  9 20:11:26 2005
@@ -137,10 +137,10 @@
 int ss_cmd_set_updateinfo(CmdParams *cmdparams, SET_REASON reason);
 int ss_cmd_set_autoupdate_cb (CmdParams *cmdparams, SET_REASON reason);
 int ss_cmd_set_autoupdatetime_cb (CmdParams *cmdparams, SET_REASON reason);
-int AutoUpdate(void);
+int AutoUpdate(void *);
 
 /* OnJoin.c */
-int JoinNewChan(void);
+int JoinNewChan(void *);
 void OnJoinBotStatus (CmdParams *cmdparams);
 int ss_event_message (CmdParams *cmdparams);
 int ss_event_versionrequest (CmdParams *cmdparams);
@@ -157,7 +157,7 @@
 int ss_event_emptychan(CmdParams *cmdparams);
 int MonJoin(Channel *c);
 int CheckMonBotKill(CmdParams *cmdparams);
-int MonBotCycle(void);
+int MonBotCycle(void *);
 
 /* scan.c */
 void ScanStatus (CmdParams *cmdparams);

Modified: branches/3.0/update.c
==============================================================================
--- branches/3.0/update.c	(original)
+++ branches/3.0/update.c	Tue Aug  9 20:11:26 2005
@@ -154,7 +154,7 @@
 	}
 }
 	
-int AutoUpdate(void) 
+int AutoUpdate(void *userptr) 
 {
 	SET_SEGV_LOCATION();
 	if ((SecureServ.autoupgrade > 0) && SecureServ.updateuname[0] != 0 && SecureServ.updatepw[0] != 0 ) {
@@ -203,7 +203,7 @@
 		case SET_CHANGE:
 			if (SecureServ.autoupgrade == 1) 
 			{
-				AddTimer (TIMER_TYPE_INTERVAL, AutoUpdate, "AutoUpdate", SecureServ.autoupgradetime);
+				AddTimer (TIMER_TYPE_INTERVAL, AutoUpdate, "AutoUpdate", SecureServ.autoupgradetime, NULL);
 			} 
 			else 
 			{