[NeoStats-Devel] [Commits] r2560 - in trunk: include src src/protocol

[email protected]
Newsgroups gmane.comp.neostats.devel
Message-ID <[email protected]>
Author: Mark
Date: Fri Apr 22 05:47:00 2005
New Revision: 2560

Modified:
   trunk/include/ircd.h
   trunk/src/ircd.c
   trunk/src/protocol/bahamut14.c
   trunk/src/protocol/bahamut18.c
   trunk/src/protocol/nefarious.c
   trunk/src/protocol/ultimate2.c
   trunk/src/protocol/ultimate3.c
   trunk/src/protocol/unreal31.c
Log:
protocol updates

Modified: trunk/include/ircd.h
==============================================================================
--- trunk/include/ircd.h	(original)
+++ trunk/include/ircd.h	Fri Apr 22 05:47:00 2005
@@ -262,6 +262,7 @@
 EXPORTFUNC void do_mode_user( const char *target, const char *modes );
 EXPORTFUNC void do_mode_channel( char *origin, char **argv, int argc );
 EXPORTFUNC void do_svsmode_user( const char *target, const char *modes, const char *ts );
+EXPORTFUNC void do_svsnick( const char *oldnick, const char *newnick, const char *ts );
 /* These are the same for now but we might need to be different in the 
  * future so use macros
  */

Modified: trunk/src/ircd.c
==============================================================================
--- trunk/src/ircd.c	(original)
+++ trunk/src/ircd.c	Fri Apr 22 05:47:00 2005
@@ -145,21 +145,21 @@
 static void( *irc_send_pong )( const char *reply );
 static void( *irc_send_server )( const char *source, const char *name, const int numeric, const char *infoline );
 static void( *irc_send_squit )( const char *server, const char *quitmsg );
-static void( *irc_send_nick )( const char *nick, const unsigned long ts, const char* newmode, const char *ident, const char *host, const char* server, const char *realname );
+static void( *irc_send_nick )( const char *nick, const unsigned long ts, const char *newmode, const char *ident, const char *host, const char *server, const char *realname );
 static void( *irc_send_server_connect )( const char *name, const int numeric, const char *infoline, const char *pass, unsigned long tsboot, unsigned long tslink );
 static void( *irc_send_netinfo )( const char *source, const char *maxglobalcnt, const unsigned long ts, const int prot, const char *cloak, const char *netname );
 static void( *irc_send_snetinfo )( const char *source, const char *maxglobalcnt, const unsigned long ts, const int prot, const char *cloak, const char *netname );
 static void( *irc_send_svinfo )( const int tscurrent, const int tsmin, const unsigned long tsnow );
 static void( *irc_send_eob )( const char *server );
-static void( *irc_send_vctrl )( const int uprot, const int nicklen, const int modex, const int gc, const char* netname );
+static void( *irc_send_vctrl )( const int uprot, const int nicklen, const int modex, const int gc, const char *netname );
 static void( *irc_send_burst )( int b );
 static void( *irc_send_svstime )( const char *source, const unsigned long ts );
-static void( *irc_send_setname )( const char* nick, const char* realname );
-static void( *irc_send_sethost )( const char* nick, const char* host );
-static void( *irc_send_setident )( const char* nick, const char* ident );
+static void( *irc_send_setname )( const char *nick, const char *realname );
+static void( *irc_send_sethost )( const char *nick, const char *host );
+static void( *irc_send_setident )( const char *nick, const char *ident );
 static void( *irc_send_serverrequptime )( const char *source, const char *target );
 static void( *irc_send_serverreqversion )( const char *source, const char *target );
-static void( *irc_send_cloakhost )( char* host );
+static void( *irc_send_cloakhost )( char *host );
 
 protocol_entry protocol_list[] =
 {
@@ -287,7 +287,7 @@
 };
 
 
-static void IrcdError( char* err )
+static void IrcdError( char *err )
 {
 	nlog( LOG_CRITICAL, "Unable to find %s in selected IRCd module", err );
 }
@@ -469,7 +469,7 @@
  *  @return none
  */
 
-void _m_globops( char* origin, char **av, int ac, int cmdptr )
+void _m_globops( char *origin, char **av, int ac, int cmdptr )
 {
 	do_globops( origin, av[0] );	
 }
@@ -489,7 +489,7 @@
  *  @return none
  */
 
-void _m_wallops( char* origin, char **av, int ac, int cmdptr )
+void _m_wallops( char *origin, char **av, int ac, int cmdptr )
 {
 	do_wallops( origin, av[0] );	
 }
@@ -509,7 +509,7 @@
  *  @return none
  */
 
-void _m_chatops( char* origin, char **av, int ac, int cmdptr )
+void _m_chatops( char *origin, char **av, int ac, int cmdptr )
 {
 	do_chatops( origin, av[0] );	
 }
@@ -529,7 +529,7 @@
  *  @return none
  */
 
-void _m_error( char* origin, char **av, int ac, int cmdptr )
+void _m_error( char *origin, char **av, int ac, int cmdptr )
 {
 	fprintf(stderr, "IRCD reported error: %s", av[0] );
 	nlog (LOG_ERROR, "IRCD reported error: %s", av[0] );
@@ -569,7 +569,7 @@
  *  @return none
  */
 
-void _m_pass( char* origin, char **av, int ac, int cmdptr )
+void _m_pass( char *origin, char **av, int ac, int cmdptr )
 {
 	
 }
@@ -988,7 +988,7 @@
 
 void _m_svsnick( char *origin, char **argv, int argc, int srv )
 {
-	do_nickchange( argv[0], argv[1], argv[2] );
+	do_svsnick( argv[0], argv[1], ( argc > 2 ) ? argv[2] : NULL );
 }
 
 /** @brief _m_setname
@@ -1137,7 +1137,7 @@
  *  @return none
  */
 
-void _m_notice( char* origin, char **argv, int argc, int cmdptr )
+void _m_notice( char *origin, char **argv, int argc, int cmdptr )
 {
 	SET_SEGV_LOCATION();
 	if( argv[0] == NULL ) {
@@ -1171,7 +1171,7 @@
  *  @return none
  */
 
-void _m_private( char* origin, char **argv, int argc, int cmdptr )
+void _m_private( char *origin, char **argv, int argc, int cmdptr )
 {
 	char target[64];
 
@@ -1205,7 +1205,7 @@
  *  @return none
  */
 
-EXPORTFUNC void process_ircd_cmd( int cmdptr, char *cmd, char* origin, char **av, int ac )
+EXPORTFUNC void process_ircd_cmd( int cmdptr, char *cmd, char *origin, char **av, int ac )
 {
 	ircd_cmd *ircd_cmd_ptr;
 	ircd_cmd_intrinsic *intrinsic_cmd_ptr;
@@ -1324,7 +1324,7 @@
  *  @return none
  */
 
-static void unsupported_cmd( const char* cmd )
+static void unsupported_cmd( const char *cmd )
 {
 	irc_chanalert( ns_botptr, _( "Warning, %s tried to %s which is not supported" ), GET_CUR_MODNAME(), cmd );
 	nlog( LOG_NOTICE, "Warning, %s tried to %s, which is not supported", GET_CUR_MODNAME(), cmd );
@@ -1354,7 +1354,7 @@
 	}
 	while( *text ) {
 		if( **text ) {
-			irc_prefmsg( botptr, target,( char* )*text );
+			irc_prefmsg( botptr, target,( char *)*text );
 		} else {
 			irc_prefmsg( botptr, target, " " );
 		}
@@ -1376,7 +1376,7 @@
 	}
 	while( *text ) {
 		if( **text ) {
-			irc_privmsg( botptr, target,( char* )*text );
+			irc_privmsg( botptr, target,( char *)*text );
 		} else {
 			irc_privmsg( botptr, target, " " );
 		}
@@ -1606,7 +1606,7 @@
 
 int irc_umode( const Bot *botptr, const char *target, long mode )
 {
-	char* newmode;
+	char *newmode;
 	
 	newmode = UmodeMaskToString( mode );
 	irc_send_umode( botptr->u->name, target, newmode );
@@ -1684,7 +1684,7 @@
 		c->persistentusers --;
 	}
 	irc_send_part( botptr->u->name, chan, quitmsg ? quitmsg : "" );
-	PartChannel( botptr->u, ( char * ) chan, quitmsg );
+	PartChannel( botptr->u, ( char *) chan, quitmsg );
 	return NS_SUCCESS;
 }
 
@@ -1714,14 +1714,14 @@
  *  @return NS_SUCCESS if succeeds, NS_FAILURE if not 
  */
 
-int irc_setname( const Bot *botptr, const char* realname )
+int irc_setname( const Bot *botptr, const char *realname )
 {
 	if( !irc_send_setname ) {
 		unsupported_cmd( "SETNAME" );
 		return NS_FAILURE;
 	}
 	irc_send_setname( botptr->name, realname );
-	strlcpy( botptr->u->info,( char* )realname, MAXHOST );
+	strlcpy( botptr->u->info,( char *)realname, MAXHOST );
 	return NS_SUCCESS;
 }
 
@@ -1730,14 +1730,14 @@
  *  @return NS_SUCCESS if succeeds, NS_FAILURE if not 
  */
 
-int irc_sethost( const Bot *botptr, const char* host )
+int irc_sethost( const Bot *botptr, const char *host )
 {
 	if( !irc_send_sethost ) {
 		unsupported_cmd( "SETHOST" );
 		return NS_FAILURE;
 	}
 	irc_send_sethost( botptr->name, host );
-	strlcpy( botptr->u->user->hostname,( char* )host, MAXHOST );
+	strlcpy( botptr->u->user->hostname,( char *)host, MAXHOST );
 	return NS_SUCCESS;
 }
  
@@ -1746,14 +1746,14 @@
  *  @return NS_SUCCESS if succeeds, NS_FAILURE if not 
  */
 
-int irc_setident( const Bot *botptr, const char* ident )
+int irc_setident( const Bot *botptr, const char *ident )
 {
 	if( !irc_send_setident ) {
 		unsupported_cmd( "SETIDENT" );
 		return NS_FAILURE;
 	}
 	irc_send_setident( botptr->name, ident );
-	strlcpy( botptr->u->user->username,( char* )ident, MAXHOST );
+	strlcpy( botptr->u->user->username,( char *)ident, MAXHOST );
 	return NS_SUCCESS;
 }
 
@@ -1839,7 +1839,7 @@
 		return NS_FAILURE;
 	}
 	irc_send_kick( botptr->u->name, chan, target, reason );
-	PartChannel( FindUser( target ), ( char * ) chan, reason[0] != 0 ?( char * )reason : NULL );
+	PartChannel( FindUser( target ), ( char *) chan, reason[0] != 0 ?( char *)reason : NULL );
 	return NS_SUCCESS;
 }
 
@@ -2351,7 +2351,7 @@
  *  @return none
  */
 
-void do_ping( const char* origin, const char* destination )
+void do_ping( const char *origin, const char *destination )
 {
 	irc_pong( origin );
 	if( ircd_srv.burst ) {
@@ -2368,7 +2368,7 @@
  *  @return none
  */
 
-void do_pong( const char* origin, const char* destination )
+void do_pong( const char *origin, const char *destination )
 {
 	Client *s;
 	CmdParams * cmdparams;
@@ -2398,7 +2398,7 @@
  *  @return none
  */
 
-void do_version( const char* nick, const char *remoteserver )
+void do_version( const char *nick, const char *remoteserver )
 {
 	SET_SEGV_LOCATION();
 	irc_numeric( RPL_VERSION, nick, "%s :%s -> %s %s", me.version, me.name, ns_module_info.build_date, ns_module_info.build_time );
@@ -2414,7 +2414,7 @@
  *  @return none
  */
 
-void do_motd( const char* nick, const char *remoteserver )
+void do_motd( const char *nick, const char *remoteserver )
 {
 	FILE *fp;
 	char buf[BUFSIZE];
@@ -2446,7 +2446,7 @@
  *  @return none
  */
 
-void do_admin( const char* nick, const char *remoteserver )
+void do_admin( const char *nick, const char *remoteserver )
 {
 	FILE *fp;
 	char buf[BUFSIZE];
@@ -2476,7 +2476,7 @@
  *  @return none
  */
 
-void do_credits( const char* nick, const char *remoteserver )
+void do_credits( const char *nick, const char *remoteserver )
 {
 	SET_SEGV_LOCATION();
 	irc_numeric( RPL_VERSION, nick, ":- NeoStats %s Credits ", me.version );
@@ -2516,7 +2516,7 @@
  *  @return none
  */
 
-void do_stats( const char* nick, const char *what )
+void do_stats( const char *nick, const char *what )
 {
 	ircd_cmd* ircd_cmd_ptr;
 	time_t tmp;
@@ -2602,10 +2602,10 @@
 
 /* SJOIN <TS> #<channel> <modes> :[@][+]<nick_1> ...  [@][+]<nick_n> */
 
-void do_sjoin( char* tstime, char* channame, char *modes, char *sjoinnick, char **argv, int argc )
+void do_sjoin( char *tstime, char *channame, char *modes, char *sjoinnick, char **argv, int argc )
 {
 	char nick[MAXNICK];
-	char* nicklist;
+	char *nicklist;
 	long mask = 0;
 	int ok = 1, j = 3;
 	Channel *c;
@@ -2659,7 +2659,7 @@
  *  @return none
  */
 
-void do_netinfo( const char* maxglobalcnt, const char* tsendsync, const char* prot, const char* cloak, const char* netname )
+void do_netinfo( const char *maxglobalcnt, const char *tsendsync, const char *prot, const char *cloak, const char *netname )
 {
 	ircd_srv.maxglobalcnt = atoi( maxglobalcnt );
 	ircd_srv.tsendsync = atoi( tsendsync );
@@ -2679,7 +2679,7 @@
  *  @return none
  */
 
-void do_snetinfo( const char* maxglobalcnt, const char* tsendsync, const char* prot, const char* cloak, const char* netname )
+void do_snetinfo( const char *maxglobalcnt, const char *tsendsync, const char *prot, const char *cloak, const char *netname )
 {
 	ircd_srv.uprot = atoi( prot );
 	strlcpy( ircd_srv.cloak, cloak, CLOAKKEYLEN );
@@ -2697,10 +2697,10 @@
  *  @return none
  */
 
-void do_join( const char* nick, const char* chanlist, const char* keys )
+void do_join( const char *nick, const char *chanlist, const char *keys )
 {
 	char *s, *t;
-	t =( char* )chanlist;
+	t =( char *)chanlist;
 	while( *( s = t ) ) {
 		t = s + strcspn( s, "," );
 		if( *t )
@@ -2718,7 +2718,7 @@
  *  @return none
  */
 
-void do_part( const char* nick, const char* chan, const char* reason )
+void do_part( const char *nick, const char *chan, const char *reason )
 {
 	PartChannel( FindUser( nick ), chan, reason );
 }
@@ -2732,7 +2732,7 @@
  *  @return none
  */
 
-void do_nick( const char *nick, const char *hopcount, const char* TS, 
+void do_nick( const char *nick, const char *hopcount, const char *TS, 
 		 const char *user, const char *host, const char *server, 
 		 const char *ip, const char *servicestamp, const char *modes, 
 		 const char *vhost, const char *realname, const char *numeric, 
@@ -2810,7 +2810,7 @@
  *  @return none
  */
 
-void do_squit( const char *name, const char* reason )
+void do_squit( const char *name, const char *reason )
 {
 	DelServer( name, reason );
 }
@@ -2852,7 +2852,7 @@
  *  @return none
  */
 
-void do_vctrl( const char* uprot, const char* nicklen, const char* modex, const char* gc, const char* netname )
+void do_vctrl( const char *uprot, const char *nicklen, const char *modex, const char *gc, const char *netname )
 {
 	ircd_srv.uprot = atoi( uprot );
 	ircd_srv.nicklen = atoi( nicklen );
@@ -2873,7 +2873,7 @@
  *  @return none
  */
 
-void do_smode( const char* targetnick, const char* modes )
+void do_smode( const char *targetnick, const char *modes )
 {
 	UserSMode( targetnick, modes );
 }
@@ -2887,7 +2887,7 @@
  *  @return none
  */
 
-void do_mode_user( const char* targetnick, const char* modes )
+void do_mode_user( const char *targetnick, const char *modes )
 {
 	UserMode( targetnick, modes );
 }
@@ -2901,13 +2901,13 @@
  *  @return none
  */
 
-void do_svsmode_user( const char* targetnick, const char* modes, const char* ts )
+void do_svsmode_user( const char *targetnick, const char *modes, const char *ts )
 {
 	char modebuf[MODESIZE];
 	
 	if( ts && isdigit( *ts ) ) {
-		const char* pModes;	
-		char* pNewModes;	
+		const char *pModes;	
+		char *pNewModes;	
 
 		SetUserServicesTS( targetnick, ts );
 		/* If only setting TS, we do not need further mode processing */
@@ -2956,7 +2956,7 @@
  *  @return none
  */
 
-void do_away( const char* nick, const char *reason )
+void do_away( const char *nick, const char *reason )
 {
 	UserAway( nick, reason );
 }
@@ -2970,7 +2970,7 @@
  *  @return none
  */
 
-void do_vhost( const char* nick, const char *vhost )
+void do_vhost( const char *nick, const char *vhost )
 {
 	SetUserVhost( nick, vhost );
 }
@@ -2984,7 +2984,7 @@
  *  @return none
  */
 
-void do_nickchange( const char * oldnick, const char *newnick, const char * ts )
+void do_nickchange( const char *oldnick, const char *newnick, const char *ts )
 {
 	UserNickChange( oldnick, newnick, ts );
 }
@@ -2998,7 +2998,7 @@
  *  @return none
  */
 
-void do_topic( const char* chan, const char *owner, const char* ts, const char *topic )
+void do_topic( const char *chan, const char *owner, const char *ts, const char *topic )
 {
 	ChannelTopic( chan, owner, ts, topic );
 }
@@ -3012,7 +3012,7 @@
  *  @return none
  */
 
-void do_server( const char *name, const char *uplink, const char* hops, const char *numeric, const char *infoline, int srv )
+void do_server( const char *name, const char *uplink, const char *hops, const char *numeric, const char *infoline, int srv )
 {
 	if( !srv ) {
 		if( uplink == NULL || *uplink == 0 ) {
@@ -3120,14 +3120,14 @@
  *  @return none
  */
 
-void do_setname( const char* nick, const char* realname )
+void do_setname( const char *nick, const char *realname )
 {
 	Client *u;
 
 	u = FindUser( nick );
 	if( u ) {
 		dlog( DEBUG1, "do_setname: setting realname of user %s to %s", nick, realname );
-		strlcpy( u->info,( char* )realname, MAXHOST );
+		strlcpy( u->info,( char *)realname, MAXHOST );
 	} else {
 		nlog( LOG_WARNING, "do_setname: user %s not found", nick );
 	}
@@ -3142,14 +3142,28 @@
  *  @return none
  */
 
-void do_sethost( const char* nick, const char* host )
+void do_svsnick( const char *oldnick, const char *newnick, const char *ts )
+{
+	do_nickchange( oldnick, newnick, ts );
+}
+
+/** @brief 
+ *
+ *  
+ *
+ *  @param 
+ *
+ *  @return none
+ */
+
+void do_sethost( const char *nick, const char *host )
 {
 	Client *u;
 
 	u = FindUser( nick );
 	if( u ) {
 		dlog( DEBUG1, "do_sethost: setting host of user %s to %s", nick, host );
-		strlcpy( u->user->hostname,( char* )host, MAXHOST );
+		strlcpy( u->user->hostname,( char *)host, MAXHOST );
 	} else {
 		nlog( LOG_WARNING, "do_sethost: user %s not found", nick );
 	}
@@ -3164,14 +3178,14 @@
  *  @return none
  */
 
-void do_setident( const char* nick, const char* ident )
+void do_setident( const char *nick, const char *ident )
 {
 	Client *u;
 
 	u = FindUser( nick );
 	if( u ) {
 		dlog( DEBUG1, "do_setident: setting ident of user %s to %s", nick, ident );
-		strlcpy( u->user->username,( char* )ident, MAXHOST );
+		strlcpy( u->user->username,( char *)ident, MAXHOST );
 	} else {
 		nlog( LOG_WARNING, "do_setident: user %s not found", nick );
 	}

Modified: trunk/src/protocol/bahamut14.c
==============================================================================
--- trunk/src/protocol/bahamut14.c	(original)
+++ trunk/src/protocol/bahamut14.c	Fri Apr 22 05:47:00 2005
@@ -144,7 +144,6 @@
 static void m_server( char *origin, char **argv, int argc, int srv );
 static void m_svsmode( char *origin, char **argv, int argc, int srv );
 static void m_nick( char *origin, char **argv, int argc, int srv );
-static void m_svsnick( char *origin, char **argv, int argc, int srv );
 static void m_burst( char *origin, char **argv, int argc, int srv );
 static void m_sjoin( char *origin, char **argv, int argc, int srv );
 
@@ -184,7 +183,6 @@
 	{MSG_NICK, 0, m_nick, 0},
 	{MSG_BURST, 0, m_burst, 0},
 	{MSG_SJOIN, 0, m_sjoin, 0},
-	{MSG_SVSNICK, 0, m_svsnick, 0},
 	{0, 0, 0, 0},
 };
 
@@ -282,7 +280,7 @@
 
 static void m_sjoin( char *origin, char **argv, int argc, int srv )
 {
-	do_sjoin( argv[0], argv[1],(( argc <= 2 ) ? argv[1] : argv[2] ), origin, argv, argc );
+	do_sjoin( argv[0], argv[1],( ( argc <= 2 ) ? argv[1] : argv[2] ), origin, argv, argc );
 }
 
 static void m_burst( char *origin, char **argv, int argc, int srv )
@@ -334,8 +332,3 @@
 		do_nickchange( origin, argv[0], argv[1] );
 	}
 }
-
-static void m_svsnick( char *origin, char **argv, int argc, int srv )
-{
-	do_nickchange( argv[0], argv[1], NULL );
-}

Modified: trunk/src/protocol/bahamut18.c
==============================================================================
--- trunk/src/protocol/bahamut18.c	(original)
+++ trunk/src/protocol/bahamut18.c	Fri Apr 22 05:47:00 2005
@@ -150,7 +150,6 @@
 static void m_server( char *origin, char **argv, int argc, int srv );
 static void m_svsmode( char *origin, char **argv, int argc, int srv );
 static void m_nick( char *origin, char **argv, int argc, int srv );
-static void m_svsnick( char *origin, char **argv, int argc, int srv );
 static void m_burst( char *origin, char **argv, int argc, int srv );
 static void m_sjoin( char *origin, char **argv, int argc, int srv );
 
@@ -190,7 +189,6 @@
 	{MSG_NICK, 0, m_nick, 0},
 	{MSG_BURST, 0, m_burst, 0},
 	{MSG_SJOIN, 0, m_sjoin, 0},
-	{MSG_SVSNICK, 0, m_svsnick, 0},
 	{0, 0, 0, 0},
 };
 
@@ -341,8 +339,3 @@
 		do_nickchange( origin, argv[0], argv[1] );
 	}
 }
-
-static void m_svsnick( char *origin, char **argv, int argc, int srv )
-{
-	do_nickchange( argv[0], argv[1], NULL );
-}

Modified: trunk/src/protocol/nefarious.c
==============================================================================
--- trunk/src/protocol/nefarious.c	(original)
+++ trunk/src/protocol/nefarious.c	Fri Apr 22 05:47:00 2005
@@ -405,7 +405,7 @@
  */
 static void m_svsnick( char *origin, char **argv, int argc, int srv )
 {
-	do_nickchange( base64_to_nick( argv[0] ), argv[1], argv[2] );
+	do_svsnick( base64_to_nick( argv[0] ), argv[1], argv[2] );
 }
 
 static void m_svsjoin( char *origin, char **argv, int argc, int srv )

Modified: trunk/src/protocol/ultimate2.c
==============================================================================
--- trunk/src/protocol/ultimate2.c	(original)
+++ trunk/src/protocol/ultimate2.c	Fri Apr 22 05:47:00 2005
@@ -335,7 +335,6 @@
 static void m_server( char *origin, char **argv, int argc, int srv );
 static void m_svsmode( char *origin, char **argv, int argc, int srv );
 static void m_nick( char *origin, char **argv, int argc, int srv );
-static void m_svsnick( char *origin, char **argv, int argc, int srv );
 static void m_vctrl( char *origin, char **argv, int argc, int srv );
 
 ProtocolInfo protocol_info = 
@@ -373,7 +372,6 @@
 	{MSG_SVSMODE,   0,   m_svsmode,   0},
 	{MSG_NICK,      TOK_NICK,      m_nick,      0},
 	{MSG_VCTRL,     0,     m_vctrl,     0},
-	{MSG_SVSNICK,   0,   m_svsnick,   0},
 	{0, 0, 0, 0},
 };
 
@@ -489,7 +487,7 @@
 	if( argv[0][0] == '#' ) {
 		do_svsmode_channel( origin, argv, argc );
 	} else {
-		do_svsmode_user( argv[0], argv[1], NULL );
+		do_svsmode_user( argv[0], argv[1], argv[2] );
 	}
 }
 
@@ -506,8 +504,3 @@
 {
 	do_vctrl( argv[0], argv[1], argv[2], argv[3], argv[14] );
 }
-
-static void m_svsnick( char *origin, char **argv, int argc, int srv )
-{
-	do_nickchange( argv[0], argv[1], NULL );
-}

Modified: trunk/src/protocol/ultimate3.c
==============================================================================
--- trunk/src/protocol/ultimate3.c	(original)
+++ trunk/src/protocol/ultimate3.c	Fri Apr 22 05:47:00 2005
@@ -183,7 +183,6 @@
 static void m_svsmode( char *origin, char **argv, int argc, int srv );
 static void m_nick( char *origin, char **argv, int argc, int srv );
 static void m_sethost( char *origin, char **argv, int argc, int srv );
-static void m_svsnick( char *origin, char **argv, int argc, int srv );
 static void m_burst( char *origin, char **argv, int argc, int srv );
 static void m_sjoin( char *origin, char **argv, int argc, int srv );
 static void m_client( char *origin, char **argv, int argc, int srv );
@@ -230,7 +229,6 @@
 	{MSG_CLIENT,    0, m_client,    0},
 	{MSG_SMODE,     0, m_smode,     0},
 	{MSG_VCTRL,     0, m_vctrl,     0},
-	{MSG_SVSNICK,   0, m_svsnick,   0},
 	{0, 0, 0, 0},
 };
 
@@ -415,8 +413,3 @@
 {
 	do_smode( argv[0], argv[1] );
 }
-
-static void m_svsnick( char *origin, char **argv, int argc, int srv )
-{
-	do_nickchange( argv[0], argv[1], NULL );
-}

Modified: trunk/src/protocol/unreal31.c
==============================================================================
--- trunk/src/protocol/unreal31.c	(original)
+++ trunk/src/protocol/unreal31.c	Fri Apr 22 05:47:00 2005
@@ -323,7 +323,6 @@
 static void m_svsmode( char *origin, char **argv, int argc, int srv );
 static void m_nick( char *origin, char **argv, int argc, int srv );
 static void m_sjoin( char *origin, char **argv, int argc, int srv );
-static void m_svsnick( char *origin, char **argv, int argc, int srv );
 static void m_smo( char *origin, char **argv, int argc, int srv );
 static void m_swhois( char *origin, char **argv, int argc, int srv );
 static void m_tkl( char *origin, char **argv, int argc, int srv );
@@ -367,7 +366,6 @@
 	{MSG_SVS2MODE, TOK_SVS2MODE, m_svsmode, 0},
 	{MSG_NICK, TOK_NICK, m_nick, 0},
 	{MSG_SJOIN, TOK_SJOIN, m_sjoin, 0},
-	{MSG_SVSNICK, TOK_SVSNICK, m_svsnick, 0},
 	{MSG_SWHOIS, TOK_SWHOIS, m_swhois, 0},
 	{MSG_SMO, TOK_SMO, m_smo, 0},
 	{MSG_TKL, TOK_TKL, m_tkl, 0},
@@ -615,16 +613,6 @@
 	do_sjoin( argv[0], argv[1],( ( argc >= 4 ) ? argv[2] : "" ), origin, argv, argc );
 }
 
-/* m_svsnick
- *  argv[0] = old nickname
- *  argv[1] = new nickname
- *  argv[2] = timestamp
- */
-static void m_svsnick( char *origin, char **argv, int argc, int srv )
-{
-	do_nickchange( argv[0], argv[1], argv[2] );
-}
-
 /* m_swhois
  *  argv[0] = nickname
  *  argv[1] = new swhois
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.