Browse files

Merge pull request #57 from Justasic/insp21

[2.1] Fixes for bug #12
  • Loading branch information...
2 parents 7e20a21 + 4bcdbca commit af361336aea8ddeff9f3ce40b2f031d64d7cc0de @rburchell rburchell committed Apr 15, 2012
Showing with 130 additions and 129 deletions.
  1. +2 −2 include/bancache.h
  2. +2 −2 include/base.h
  3. +2 −2 include/caller.h
  4. +2 −2 include/channels.h
  5. +2 −2 include/command_parse.h
  6. +2 −2 include/commands/cmd_whowas.h
  7. +2 −2 include/ctables.h
  8. +2 −2 include/cull_list.h
  9. +2 −2 include/dns.h
  10. +2 −2 include/dynamic.h
  11. +2 −2 include/exitcodes.h
  12. +2 −2 include/filelogger.h
  13. +2 −2 include/hashcomp.h
  14. +2 −2 include/inspircd.h
  15. +2 −2 include/inspsocket.h
  16. +2 −2 include/inspstring.h
  17. +2 −2 include/logger.h
  18. +2 −2 include/membership.h
  19. +2 −2 include/mode.h
  20. +2 −2 include/modules.h
  21. +2 −2 include/numerics.h
  22. +2 −2 include/protocol.h
  23. +2 −2 include/snomasks.h
  24. +2 −2 include/socket.h
  25. +2 −2 include/testsuite.h
  26. +2 −2 include/threadengine.h
  27. +2 −2 include/threadengines/threadengine_pthread.h
  28. +2 −2 include/typedefs.h
  29. +2 −2 include/usermanager.h
  30. +2 −2 include/users.h
  31. +2 −2 include/xline.h
  32. +2 −2 src/commands/cmd_away.cpp
  33. +2 −2 src/commands/cmd_commands.cpp
  34. +2 −2 src/commands/cmd_eline.cpp
  35. +2 −2 src/commands/cmd_ison.cpp
  36. +2 −2 src/commands/cmd_join.cpp
  37. +2 −2 src/commands/cmd_links.cpp
  38. +2 −2 src/commands/cmd_lusers.cpp
  39. +2 −2 src/commands/cmd_names.cpp
  40. +2 −2 src/commands/cmd_userhost.cpp
  41. +2 −2 src/commands/cmd_version.cpp
  42. +2 −2 src/modules/account.h
  43. +2 −2 src/modules/hash.h
  44. +2 −2 src/modules/httpd.h
  45. +2 −2 src/modules/m_cap.h
  46. +2 −2 src/modules/m_regex.h
  47. +2 −2 src/modules/m_spanningtree/cachetimer.h
  48. +2 −2 src/modules/m_spanningtree/commands.h
  49. +2 −2 src/modules/m_spanningtree/link.h
  50. +2 −2 src/modules/m_spanningtree/main.h
  51. +2 −2 src/modules/m_spanningtree/protocolinterface.h
  52. +3 −2 src/modules/m_spanningtree/remoteuser.h
  53. +2 −2 src/modules/m_spanningtree/resolvers.h
  54. +2 −2 src/modules/m_spanningtree/treeserver.h
  55. +2 −2 src/modules/m_spanningtree/treesocket.h
  56. +2 −2 src/modules/m_spanningtree/utils.h
  57. +2 −2 src/modules/opflags.h
  58. +2 −2 src/modules/sasl.h
  59. +2 −2 src/modules/spanningtree.h
  60. +2 −2 src/modules/ssl.h
  61. +2 −2 src/socketengines/socketengine_poll.cpp
  62. +2 −2 src/socketengines/socketengine_ports.cpp
  63. +2 −2 win/colours.h
  64. +3 −3 win/win32service.h
View
4 include/bancache.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __BANCACHE_H
-#define __BANCACHE_H
+#ifndef BANCACHE_H
+#define BANCACHE_H
/** Stores a cached ban entry.
* Each ban has one of these hashed in a hash_map to make for faster removal
View
4 include/base.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __BASE_H__
-#define __BASE_H__
+#ifndef BASE_H
+#define BASE_H
/** The server instance - global variable */
CoreExport extern InspIRCd* ServerInstance;
View
4 include/caller.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __CALLER__H__
-#define __CALLER__H__
+#ifndef CALLER_H
+#define CALLER_H
/** The templates below can be auto generated by tools/create_templates.pl.
* They are used to represent a functor with a given number of parameters and
View
4 include/channels.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __CHANNELS_H__
-#define __CHANNELS_H__
+#ifndef CHANNELS_H
+#define CHANNELS_H
class CoreExport BanItem
{
View
4 include/command_parse.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __COMMAND_PARSE_H
-#define __COMMAND_PARSE_H
+#ifndef COMMAND_PARSE_H
+#define COMMAND_PARSE_H
/** A list of dll/so files containing the command handlers for the core
*/
View
4 include/commands/cmd_whowas.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __CMD_WHOWAS_H__
-#define __CMD_WHOWAS_H__
+#ifndef CMD_WHOWAS_H
+#define CMD_WHOWAS_H
class WhoWasMaintainer : public DataProvider
{
View
4 include/ctables.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __CTABLES_H__
-#define __CTABLES_H__
+#ifndef CTABLES_H
+#define CTABLES_H
/** Used to indicate command success codes
*/
View
4 include/cull_list.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __CULLLIST_H__
-#define __CULLLIST_H__
+#ifndef CULL_LIST_H
+#define CULL_LIST_H
/**
* The CullList class is used to delete objects at the end of the main loop to
View
4 include/dns.h
@@ -29,8 +29,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _DNS_H
-#define _DNS_H
+#ifndef DNS_H
+#define DNS_H
/**
* Result status, used internally
View
4 include/dynamic.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __DLL_H
-#define __DLL_H
+#ifndef DLL_H
+#define DLL_H
/** The DLLManager class is able to load a module file by filename,
* and locate its init_module symbol.
View
4 include/exitcodes.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __EXITCODE_H__
-#define __EXITCODE_H__
+#ifndef EXITCODE_H
+#define EXITCODE_H
/** Valid exit codes to be used with InspIRCd::Exit()
*/
View
4 include/filelogger.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __LOG_H__
-#define __LOG_H__
+#ifndef FILELOGGER_H
+#define FILELOGGER_H
/** Debug levels for use with InspIRCd::Log()
* */
View
4 include/hashcomp.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef _HASHCOMP_H_
-#define _HASHCOMP_H_
+#ifndef HASHCOMP_H
+#define HASHCOMP_H
#include <cstring>
#include <string>
View
4 include/inspircd.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __INSPIRCD_H__
-#define __INSPIRCD_H__
+#ifndef INSPIRCD_H
+#define INSPIRCD_H
#define _FILE_OFFSET_BITS 64
#ifndef _LARGEFILE_SOURCE
View
4 include/inspsocket.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __INSP_SOCKET_H__
-#define __INSP_SOCKET_H__
+#ifndef INSPSOCKET_H
+#define INSPSOCKET_H
/**
* States which a socket may be in
View
4 include/inspstring.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __IN_INSPSTRING_H
-#define __IN_INSPSTRING_H
+#ifndef INSPSTRING_H
+#define INSPSTRING_H
// This (inspircd_config) is needed as inspstring doesn't pull in the central header
#include <cstring>
View
4 include/logger.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __LOGMANAGER_H
-#define __LOGMANAGER_H
+#ifndef LOGGER_H
+#define LOGGER_H
/** This class implements a nonblocking writer.
* Most people writing an ircd give little thought to their disk
View
4 include/membership.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __MEMBERSHIP_H__
-#define __MEMBERSHIP_H__
+#ifndef MEMBERSHIP_H
+#define MEMBERSHIP_H
class CoreExport Membership : public Extensible
{
View
4 include/mode.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __MODE_H
-#define __MODE_H
+#ifndef MODE_H
+#define MODE_H
#define MODE_ID_MAX 128
View
4 include/modules.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __MODULES_H
-#define __MODULES_H
+#ifndef MODULES_H
+#define MODULES_H
#include <string>
#include <deque>
View
4 include/numerics.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __NUMERICS_H
-#define __NUMERICS_H
+#ifndef NUMERICS_H
+#define NUMERICS_H
/*
* This file is aimed providing a string that is easier to use than using the numeric
View
4 include/protocol.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __PROTOCOL_H__
-#define __PROTOCOL_H__
+#ifndef PROTOCOL_H
+#define PROTOCOL_H
class User;
View
4 include/snomasks.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __SNOMASKS_H__
-#define __SNOMASKS_H__
+#ifndef SNOMASKS_H
+#define SNOMASKS_H
class Snomask
{
View
4 include/socket.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef INSPIRCD_SOCKET_H
-#define INSPIRCD_SOCKET_H
+#ifndef SOCKET_H
+#define SOCKET_H
#ifndef WIN32
View
4 include/testsuite.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __TESTSUITE_H__
-#define __TESTSUITE_H__
+#ifndef TESTSUITE_H
+#define TESTSUITE_H
class TestSuite
{
View
4 include/threadengine.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __THREADENGINE__
-#define __THREADENGINE__
+#ifndef THREADENGINE_H
+#define THREADENGINE_H
#ifdef WINDOWS
// #include "threadengines/threadengine_win32.h"
View
4 include/threadengines/threadengine_pthread.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __THREADENGINE_PTHREAD__
-#define __THREADENGINE_PTHREAD__
+#ifndef THREADENGINE_PTHREAD_H
+#define THREADENGINE_PTHREAD_H
#include <pthread.h>
View
4 include/typedefs.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __TYPEDEF_H__
-#define __TYPEDEF_H__
+#ifndef TYPEDEFS_H
+#define TYPEDEFS_H
#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
typedef nspace::hash_map<std::string, User*, nspace::hash_compare<std::string, std::less<std::string> > > user_hash;
View
4 include/usermanager.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __USERMANAGER_H
-#define __USERMANAGER_H
+#ifndef USERMANAGER_H
+#define USERMANAGER_H
#include <list>
View
4 include/users.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __USERS_H__
-#define __USERS_H__
+#ifndef USERS_H
+#define USERS_H
/** connect class types
*/
View
4 include/xline.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __XLINE_H
-#define __XLINE_H
+#ifndef XLINE_H
+#define XLINE_H
/** XLine is the base class for ban lines such as G lines and K lines.
* Modules may derive from this, and their xlines will automatically be
View
4 src/commands/cmd_away.cpp
@@ -13,8 +13,8 @@
#include "inspircd.h"
-#ifndef __CMD_AWAY_H__
-#define __CMD_AWAY_H__
+#ifndef CMD_AWAY_H
+#define CMD_AWAY_H
// include the common header files
View
4 src/commands/cmd_commands.cpp
@@ -14,8 +14,8 @@
#include "inspircd.h"
#include "command_parse.h"
-#ifndef __CMD_COMMANDS_H__
-#define __CMD_COMMANDS_H__
+#ifndef CMD_COMMANDS_H
+#define CMD_COMMANDS_H
// include the common header files
View
4 src/commands/cmd_eline.cpp
@@ -26,8 +26,8 @@
* ---------------------------------------------------
*/
-#ifndef __CMD_ELINE_H__
-#define __CMD_ELINE_H__
+#ifndef CMD_ELINE_H
+#define CMD_ELINE_H
// include the common header files
View
4 src/commands/cmd_ison.cpp
@@ -13,8 +13,8 @@
#include "inspircd.h"
-#ifndef __CMD_ISON_H__
-#define __CMD_ISON_H__
+#ifndef CMD_ISON_H
+#define CMD_ISON_H
// include the common header files
View
4 src/commands/cmd_join.cpp
@@ -14,8 +14,8 @@
#include "inspircd.h"
#include "command_parse.h"
-#ifndef __CMD_JOIN_H__
-#define __CMD_JOIN_H__
+#ifndef CMD_JOIN_H
+#define CMD_JOIN_H
// include the common header files
View
4 src/commands/cmd_links.cpp
@@ -13,8 +13,8 @@
#include "inspircd.h"
-#ifndef __CMD_LINKS_H__
-#define __CMD_LINKS_H__
+#ifndef CMD_LINKS_H
+#define CMD_LINKS_H
// include the common header files
View
4 src/commands/cmd_lusers.cpp
@@ -14,8 +14,8 @@
#include "inspircd.h"
#include "protocol.h"
-#ifndef __CMD_LUSERS_H__
-#define __CMD_LUSERS_H__
+#ifndef CMD_LUSERS_H
+#define CMD_LUSERS_H
// include the common header files
View
4 src/commands/cmd_names.cpp
@@ -14,8 +14,8 @@
#include "inspircd.h"
#include "command_parse.h"
-#ifndef __CMD_NAMES_H__
-#define __CMD_NAMES_H__
+#ifndef CMD_NAMES_H
+#define CMD_NAMES_H
// include the common header files
View
4 src/commands/cmd_userhost.cpp
@@ -13,8 +13,8 @@
#include "inspircd.h"
-#ifndef __CMD_USERHOST_H__
-#define __CMD_USERHOST_H__
+#ifndef CMD_USERHOST_H
+#define CMD_USERHOST_H
// include the common header files
View
4 src/commands/cmd_version.cpp
@@ -13,8 +13,8 @@
#include "inspircd.h"
-#ifndef __CMD_VERSION_H__
-#define __CMD_VERSION_H__
+#ifndef CMD_VERSION_H
+#define CMD_VERSION_H
// include the common header files
View
4 src/modules/account.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __ACCOUNT_H__
-#define __ACCOUNT_H__
+#ifndef ACCOUNT_H
+#define ACCOUNT_H
class AccountEvent : public Event
{
View
4 src/modules/hash.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __HASH_H__
-#define __HASH_H__
+#ifndef HASH_H
+#define HASH_H
#include "modules.h"
View
4 src/modules/httpd.h
@@ -13,8 +13,8 @@
#include "base.h"
-#ifndef __HTTPD_H__
-#define __HTTPD_H__
+#ifndef HTTPD_H
+#define HTTPD_H
#include <string>
#include <sstream>
View
4 src/modules/m_cap.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __CAP_H__
-#define __CAP_H__
+#ifndef M_CAP_H
+#define M_CAP_H
#include <map>
#include <string>
View
4 src/modules/m_regex.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef _M_REGEX_H
-#define _M_REGEX_H
+#ifndef M_REGEX_H
+#define M_REGEX_H
#include "inspircd.h"
View
4 src/modules/m_spanningtree/cachetimer.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __TIMESYNC_H__
-#define __TIMESYNC_H__
+#ifndef M_SPANNINGTREE_CACHETIMER_H
+#define M_SPANNINGTREE_CACHETIMER_H
#include "timer.h"
View
4 src/modules/m_spanningtree/commands.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __COMMANDS_H__
-#define __COMMANDS_H__
+#ifndef M_SPANNINGTREE_COMMANDS_H
+#define M_SPANNINGTREE_COMMANDS_H
#include "main.h"
View
4 src/modules/m_spanningtree/link.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __LINK_H__
-#define __LINK_H__
+#ifndef M_SPANNINGTREE_LINK_H
+#define M_SPANNINGTREE_LINK_H
class Link : public refcountbase
{
View
4 src/modules/m_spanningtree/main.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __ST_MAIN__
-#define __ST_MAIN__
+#ifndef M_SPANNINGTREE_MAIN_H
+#define M_SPANNINGTREE_MAIN_H
#include "inspircd.h"
#include <stdarg.h>
View
4 src/modules/m_spanningtree/protocolinterface.h
@@ -1,5 +1,5 @@
-#ifndef _SPANNINGTREE_PROTOCOL_INT_
-#define _SPANNINGTREE_PROTOCOL_INT_
+#ifndef M_SPANNINGTREE_PROTOCOLINTERFACE_H
+#define M_SPANNINGTREE_PROTOCOLINTERFACE_H
class SpanningTreeUtilities;
class ModuleSpanningTree;
View
5 src/modules/m_spanningtree/remoteuser.h
@@ -1,4 +1,5 @@
-
+#ifndef M_SPANNINGTREE_REMOTEUSER_H
+#define M_SPANNINGTREE_REMOTEUSER_H
class CoreExport RemoteUser : public User
{
public:
@@ -11,4 +12,4 @@ class CoreExport RemoteUser : public User
virtual void DoWhois(User* src);
};
-
+#endif
View
4 src/modules/m_spanningtree/resolvers.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __RESOLVERS__H__
-#define __RESOLVERS__H__
+#ifndef M_SPANNINGTREE_RESOLVERS_H
+#define M_SPANNINGTREE_RESOLVERS_H
#include "socket.h"
#include "inspircd.h"
View
4 src/modules/m_spanningtree/treeserver.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __TREESERVER_H__
-#define __TREESERVER_H__
+#ifndef M_SPANNINGTREE_TREESERVER_H
+#define M_SPANNINGTREE_TREESERVER_H
#include "treesocket.h"
View
4 src/modules/m_spanningtree/treesocket.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __TREESOCKET_H__
-#define __TREESOCKET_H__
+#ifndef M_SPANNINGTREE_TREESOCKET_H
+#define M_SPANNINGTREE_TREESOCKET_H
#include "socket.h"
#include "inspircd.h"
View
4 src/modules/m_spanningtree/utils.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __ST__UTIL__
-#define __ST__UTIL__
+#ifndef M_SPANNINGTREE_UTILS_H
+#define M_SPANNINGTREE_UTILS_H
#include "inspircd.h"
#include "cull_list.h"
View
4 src/modules/opflags.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __OPFLAGS_H__
-#define __OPFLAGS_H__
+#ifndef OPFLAGS_H
+#define OPFLAGS_H
class OpFlagProvider : public DataProvider
{
View
4 src/modules/sasl.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __SASL_H__
-#define __SASL_H__
+#ifndef SASL_H
+#define SASL_H
class SASLHook : public classbase
{
View
4 src/modules/spanningtree.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __SPANNINGTREE_H__
-#define __SPANNINGTREE_H__
+#ifndef SPANNINGTREE_H
+#define SPANNINGTREE_H
struct AddServerEvent : public Event
{
View
4 src/modules/ssl.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __SSL_H__
-#define __SSL_H__
+#ifndef SSL_H
+#define SSL_H
#include "inspsocket.h"
#include <map>
View
4 src/socketengines/socketengine_poll.cpp
@@ -14,8 +14,8 @@
#include "inspircd.h"
#include "exitcodes.h"
-#ifndef __SOCKETENGINE_POLL__
-#define __SOCKETENGINE_POLL__
+#ifndef SOCKETENGINE_POLL
+#define SOCKETENGINE_POLL
#include <vector>
#include <string>
View
4 src/socketengines/socketengine_ports.cpp
@@ -15,8 +15,8 @@
#include "exitcodes.h"
#include <port.h>
-#ifndef __SOCKETENGINE_PORTS__
-#define __SOCKETENGINE_PORTS__
+#ifndef SOCKETENGINE_PORTS
+#define SOCKETENGINE_PORTS
#ifndef __sun
# error You need Solaris 10 or later to make use of this code.
View
4 win/colours.h
@@ -11,8 +11,8 @@
* ---------------------------------------------------
*/
-#ifndef __COLOURS_H
-#define __COLOURS_H
+#ifndef COLORS_H
+#define COLORS_H
#define TRED FOREGROUND_RED | FOREGROUND_INTENSITY
#define TGREEN FOREGROUND_GREEN | FOREGROUND_INTENSITY
View
6 win/win32service.h
@@ -1,10 +1,10 @@
-#ifndef _WIN32SERVICE_H_
-#define _WIN32SERVICE_H_
+#ifndef WIN32SERVICE_H
+#define WIN32SERVICE_H
/* Hook for win32service.cpp to exit properly with the service specific error code */
void SetServiceStopped(int status);
/* Marks the service as running, not called until the config is parsed */
void SetServiceRunning();
-#endif
+#endif

0 comments on commit af36133

Please sign in to comment.