diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/connection.h | 6 | ||||
| -rw-r--r-- | include/dns.h | 4 | ||||
| -rw-r--r-- | include/modules.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/connection.h b/include/connection.h index 444d82d23..304f20cd9 100644 --- a/include/connection.h +++ b/include/connection.h @@ -105,7 +105,7 @@ class ircd_connector : public Extensible /** Create an outbound connection to a listening socket */ - bool MakeOutboundConnection(char* host, int port); + bool MakeOutboundConnection(char* newhost, int newport); /** Return the servername on this established connection */ @@ -156,7 +156,7 @@ class ircd_connector : public Extensible /** Set both the host and the port in one operation for this connection */ - bool SetHostAndPort(char* host, int port); + bool SetHostAndPort(char* newhost, int newport); /** Close the connection by calling close() on its file descriptor * This function call updates no other data. @@ -268,7 +268,7 @@ class connection : public Extensible /** Begin an outbound mesh link to another ircd on a network you are already an authenticated member of */ - bool MeshCookie(char* targethost, int port, long cookie, char* servername); + bool MeshCookie(char* targethost, int port, unsigned long cookie, char* servername); /** Terminate a link to 'targethost' by calling the ircd_connector::CloseConnection method. */ diff --git a/include/dns.h b/include/dns.h index bdc7326bf..034efb930 100644 --- a/include/dns.h +++ b/include/dns.h @@ -35,9 +35,9 @@ struct dns_ip4list { class DNS { private: - char *result; in_addr *binip; - int t,i; + char* result; + int t; void dns_init(); unsigned int fd; void dns_init_2(const char* dnsserver); diff --git a/include/modules.h b/include/modules.h index 78cc2553d..a68b6e9b8 100644 --- a/include/modules.h +++ b/include/modules.h @@ -76,7 +76,7 @@ typedef std::deque<userrec*> chanuserlist; // loaded modules in a readable simple way, e.g.: // 'FOREACH_MOD OnConnect(user);' -#define FOREACH_MOD for (int i = 0; i <= MODCOUNT; i++) modules[i]-> +#define FOREACH_MOD for (int _i = 0; _i <= MODCOUNT; _i++) modules[_i]-> // This define is similar to the one above but returns a result in MOD_RESULT. // The first module to return a nonzero result is the value to be accepted, @@ -85,8 +85,8 @@ typedef std::deque<userrec*> chanuserlist; // ********************************************************************************************* #define FOREACH_RESULT(x) { MOD_RESULT = 0; \ - for (int i = 0; i <= MODCOUNT; i++) { \ - int res = modules[i]->x ; \ + for (int _i = 0; _i <= MODCOUNT; _i++) { \ + int res = modules[_i]->x ; \ if (res != 0) { \ MOD_RESULT = res; \ break; \ |