[Libirc-commits] SF.net SVN: libirc: [232] trunk/libirc

[<br...@us...>]

Revision: 232
          http://libirc.svn.sourceforge.net/libirc/?rev=232&view=rev
Author:   brlcad
Date:     2007-07-31 01:37:50 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
s/loger/logger/, and fix scope on the default loggers so they don't run into each other in the library.  libIRC is now compilation-functional again.

Modified Paths:
--------------
    trunk/libirc/include/IRCClient.h
    trunk/libirc/include/IRCServer.h
    trunk/libirc/src/IRCClient.cpp
    trunk/libirc/src/IRCServer.cpp

Modified: trunk/libirc/include/IRCClient.h
===================================================================
--- trunk/libirc/include/IRCClient.h	2007-07-31 08:33:52 UTC (rev 231)
+++ trunk/libirc/include/IRCClient.h	2007-07-31 08:37:50 UTC (rev 232)
@@ -66,7 +66,7 @@
 	virtual ~IRCClient();
 
 	// logging
-	void	setLogHandler ( IRCClientLogHandler * loger );
+	void	setLogHandler ( IRCClientLogHandler * logger );
 
 	virtual void setLogfile ( std::string file );
 	virtual std::string  getLogfile ( void );
@@ -275,4 +275,4 @@
 	float											minCycleTime;
 };
 
-#endif //_IRC_CLIENT_H_
\ No newline at end of file
+#endif //_IRC_CLIENT_H_

Modified: trunk/libirc/include/IRCServer.h
===================================================================
--- trunk/libirc/include/IRCServer.h	2007-07-31 08:33:52 UTC (rev 231)
+++ trunk/libirc/include/IRCServer.h	2007-07-31 08:37:50 UTC (rev 232)
@@ -66,7 +66,7 @@
 	virtual ~IRCServer();
 
 	// loging
-	void	setLogHandler ( IRCServerLogHandler * loger );
+	void	setLogHandler ( IRCServerLogHandler * logger );
 
 	virtual void setLogfile ( std::string file );
 	virtual std::string  getLogfile ( void );
@@ -128,4 +128,4 @@
 	std::vector<IRCServerConnectedClient>::iterator getClientItr ( IRCServerConnectedClient *client );
 };
 
-#endif //_IRC_SERVER_H_
\ No newline at end of file
+#endif //_IRC_SERVER_H_

Modified: trunk/libirc/src/IRCClient.cpp
===================================================================
--- trunk/libirc/src/IRCClient.cpp	2007-07-31 08:33:52 UTC (rev 231)
+++ trunk/libirc/src/IRCClient.cpp	2007-07-31 08:37:50 UTC (rev 232)
@@ -47,7 +47,7 @@
 	}
 };
 
-DefaultIRCLogHandler	defaultLoger;
+static DefaultIRCLogHandler	defaultLogger;
 
 // IRC class stuff
 
@@ -63,7 +63,7 @@
 	debugLogLevel = 0;
 	ircServerPort = _DEFAULT_IRC_PORT;
 	ircConnectionState = eNotConnected;
-	logHandler = &defaultLoger;
+	logHandler = &defaultLogger;
 }
 
 // irc client
@@ -275,12 +275,12 @@
 	return true;
 }
 
-void	IRCClient::setLogHandler ( IRCClientLogHandler * loger )
+void	IRCClient::setLogHandler ( IRCClientLogHandler * logger )
 {
-	if (!loger)
-		logHandler = &defaultLoger;
+	if (!logger)
+		logHandler = &defaultLogger;
 	else
-		logHandler = loger;
+		logHandler = logger;
 }
 
 void IRCClient::log ( const char *text, int level )

Modified: trunk/libirc/src/IRCServer.cpp
===================================================================
--- trunk/libirc/src/IRCServer.cpp	2007-07-31 08:33:52 UTC (rev 231)
+++ trunk/libirc/src/IRCServer.cpp	2007-07-31 08:37:50 UTC (rev 232)
@@ -47,7 +47,7 @@
 	}
 };
 
-DefaultServerIRCLogHandler	defaultLoger;
+static DefaultServerIRCLogHandler	defaultLogger;
 
 
 IRCServerConnectedClient::IRCServerConnectedClient ( IRCServer *_server, TCPServerConnectedPeer* _peer )
@@ -91,7 +91,7 @@
 	tcpServer = NULL;
 
 	debugLogLevel = 0;
-	logHandler = &defaultLoger;
+	logHandler = &defaultLogger;
 
 	ircMessageTerminator = "\r\n";
 	ircCommandDelimator	 = " ";
@@ -115,12 +115,12 @@
 	return clients.end();
 }
 
-void IRCServer::setLogHandler ( IRCServerLogHandler * loger )
+void IRCServer::setLogHandler ( IRCServerLogHandler * logger )
 {
-	if (!loger)
-		logHandler = &defaultLoger;
+	if (!logger)
+		logHandler = &defaultLogger;
 	else
-		logHandler = loger;
+		logHandler = logger;
 }
 
 void IRCServer::setLogfile ( std::string file )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.