Get rid of remaining tabs and replace them with spaces.

[srvx.git] / src / proto.h

diff --git a/src/proto.h b/src/proto.h
index 6f4dccf1274bfefc1f04c0a38d8567882e05cba6..23f4a3181b8ab0bdf404d7204eec6c2e3a0cab8c 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -27,15 +27,11 @@
  * which has much nicer interfaces that hide most of the ugly
  * differences between protocol dialects. */
 
-#define COMBO_NUMERIC_LEN 5   /* 1/2, 1/3 or 2/3 digits for server/client parts */
-#define MAXLEN         512   /* Maximum IRC line length */
-#define MAXNUMPARAMS    200
+#define COMBO_NUMERIC_LEN   5   /* 1/2, 1/3 or 2/3 digits for server/client parts */
+#define MAXLEN              512   /* Maximum IRC line length */
+#define MAXNUMPARAMS        200
 #define ALLCHANMSG_FUNCS_MAX  4 /* +1 == 5 potential 'allchanmsg' funcs */
 
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
 struct gline;
 struct server;
 struct userNode;
@@ -51,37 +47,37 @@ enum cState
     CONNECTED
 };
 
-#define UPLINK_UNAVAILABLE     0x001
+#define UPLINK_UNAVAILABLE  0x001
 
 struct uplinkNode
 {
-    char               *name;
+    char    *name;
 
-    char               *host;
-    int                        port;
+    char    *host;
+    int     port;
 
-    struct sockaddr    *bind_addr;
-    int                bind_addr_len;
+    struct sockaddr *bind_addr;
+    int     bind_addr_len;
 
-    char               *password;
-    char               *their_password;
+    char    *password;
+    char    *their_password;
 
-    enum cState                state;
-    int                        tries;
-    int                        max_tries;
-    long               flags;
+    enum cState state;
+    int         tries;
+    int         max_tries;
+    long        flags;
 
-    struct uplinkNode  *prev;
-    struct uplinkNode  *next;
+    struct uplinkNode   *prev;
+    struct uplinkNode   *next;
 };
 
 struct cManagerNode
 {
-    struct uplinkNode  *uplinks;
-    struct uplinkNode  *uplink;
+    struct uplinkNode   *uplinks;
+    struct uplinkNode   *uplink;
 
-    int                        cycles;
-    int                        enabled;
+    int     cycles;
+    int     enabled;
 };
 
 #ifdef WITH_PROTOCOL_P10
@@ -102,8 +98,8 @@ struct userNode *get_chanmsg_bot(unsigned char prefix);
 typedef void (*privmsg_func_t) (struct userNode *user, struct userNode *target, const char *text, int server_qualified);
 void reg_privmsg_func(struct userNode *user, privmsg_func_t handler);
 void reg_notice_func(struct userNode *user, privmsg_func_t handler);
-void unreg_privmsg_func(struct userNode *user, privmsg_func_t handler);
-void unreg_notice_func(struct userNode *user, privmsg_func_t handler);
+void unreg_privmsg_func(struct userNode *user);
+void unreg_notice_func(struct userNode *user);
 
 typedef void (*oper_func_t) (struct userNode *user);
 void reg_oper_func(oper_func_t handler);
@@ -162,6 +158,7 @@ void irc_numeric(struct userNode *user, unsigned int num, const char *format, ..
 #define RPL_WHOISUSER           311
 #define RPL_WHOISSERVER         312
 #define RPL_WHOISOPERATOR       313
+#define RPL_WHOISIDLE           317
 #define RPL_ENDOFWHOIS          318
 #define RPL_WHOISCHANNELS       319
 #define RPL_WHOISACCOUNT        330
@@ -208,7 +205,7 @@ struct mod_chanmode {
 #define MCP_ALLOW_OVB     0x0001 /* allow op, voice, ban manipulation */
 #define MCP_FROM_SERVER   0x0002 /* parse as from a server */
 #define MCP_KEY_FREE      0x0004 /* -k without a key argument */
-#define MCP_REGISTERED   0x0008 /* chan is already registered; do not allow changes to MODE_REGISTERED */
+#define MCP_REGISTERED    0x0008 /* chan is already registered; do not allow changes to MODE_REGISTERED */
 #define MCP_UPASS_FREE    0x0010 /* -U without a key argument */
 #define MCP_APASS_FREE    0x0020 /* -A without a key argument */
 #define MC_ANNOUNCE       0x0100 /* send a mod_chanmode() change out */