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

Author: Mark
Date: Fri May  6 04:55:38 2005
New Revision: 2586

Modified:
   trunk/include/protocol.h
   trunk/src/ircprotocol.c
   trunk/src/ircrecv.c
   trunk/src/numerics.c
   trunk/src/protocol/client.c
Log:
fix warnings introduced in protocol changes

Modified: trunk/include/protocol.h
==============================================================================
--- trunk/include/protocol.h	(original)
+++ trunk/include/protocol.h	Fri May  6 04:55:38 2005
@@ -218,6 +218,10 @@
 MSGDEF( MSG_REMGLINE );
 MSGDEF( TOK_REMGLINE );
 
+EXPORTVAR extern char *numeric219;
+EXPORTVAR extern char *numeric242;
+EXPORTVAR extern char *numeric351;
+
 EXPORTVAR extern ircd_server ircd_srv;
 
 EXPORTFUNC int ircsplitbuf( char *buf, char ***argv, int colon_special );

Modified: trunk/src/ircprotocol.c
==============================================================================
--- trunk/src/ircprotocol.c	(original)
+++ trunk/src/ircprotocol.c	Fri May  6 04:55:38 2005
@@ -100,9 +100,9 @@
 	ircd_cmd_ptr = numeric_cmd_list;	
 	/* Process numeric replies */
 	while( ircd_cmd_ptr->name ) {
-		if( !ircstrcasecmp( ircd_cmd_ptr->name, cmd ) ) {
+		if( !ircstrcasecmp( *ircd_cmd_ptr->name, cmd ) ) {
 			if( ircd_cmd_ptr->handler ) {
-				dlog( DEBUG3, "process_ircd_cmd: running command %s", ircd_cmd_ptr->name );
+				dlog( DEBUG3, "process_ircd_cmd: running command %s", *ircd_cmd_ptr->name );
 				ircd_cmd_ptr->handler( origin, av, ac, cmdptr );
 			} else {
 				dlog( DEBUG3, "process_ircd_cmd: ignoring command %s", cmd );

Modified: trunk/src/ircrecv.c
==============================================================================
--- trunk/src/ircrecv.c	(original)
+++ trunk/src/ircrecv.c	Fri May  6 04:55:38 2005
@@ -1554,7 +1554,7 @@
 		ircd_cmd_ptr = cmd_list;
 		while( ircd_cmd_ptr->name ) {
 			if( ircd_cmd_ptr->usage > 0 ) {
-				irc_numeric( RPL_STATSCOMMANDS, u->name, "Command %s Usage %d", ircd_cmd_ptr->name, ircd_cmd_ptr->usage );
+				irc_numeric( RPL_STATSCOMMANDS, u->name, "Command %s Usage %d", *ircd_cmd_ptr->name, ircd_cmd_ptr->usage );
 			}
 			ircd_cmd_ptr ++;
 		}

Modified: trunk/src/numerics.c
==============================================================================
--- trunk/src/numerics.c	(original)
+++ trunk/src/numerics.c	Fri May  6 04:55:38 2005
@@ -27,16 +27,16 @@
 #include "numerics.h"
 #include "base64.h"
 
-char *numeric351 = "351";
-char *numeric242 = "242";
 char *numeric219 = "219";
+char *numeric242 = "242";
+char *numeric351 = "351";
 
 irc_cmd numeric_cmd_list[] = {
 	/*Message	Token	handler	usage */
-	{&numeric351, NULL, _m_numeric351, 0},
-	{&numeric242, NULL, _m_numeric242, 0},
 /*  RX: :irc.foo.com 219 NeoStats u :End of /STATS report */
 	{&numeric219, NULL, _m_numericdefault, 0},
+	{&numeric242, NULL, _m_numeric242, 0},
+	{&numeric351, NULL, _m_numeric351, 0},
 	{0, 0, 0, 0},
 };
 

Modified: trunk/src/protocol/client.c
==============================================================================
--- trunk/src/protocol/client.c	(original)
+++ trunk/src/protocol/client.c	Fri May  6 04:55:38 2005
@@ -209,12 +209,13 @@
 	"+o",
 };
 
+char *numeric376 = "376";
 irc_cmd cmd_list[] = 
 {
 	/*Message	Token	Function	usage */
 	{&MSG_PRIVATE, 0, m_private, 0},
 	{&MSG_NOTICE, 0, _m_notice, 0},
-	{"376", 0, m_emotd, 0},
+	{&numeric376, 0, m_emotd, 0},
 	{&MSG_NICK, 0, m_nick, 0},
 	{&MSG_TOPIC, 0, m_topic, 0},
 	{&MSG_KICK, 0, m_kick, 0},