Remove trailing whitespace from all .c and .h files.

[solanum.git] / include / numeric.h

diff --git a/include/numeric.h b/include/numeric.h
index 16059b7da12043fef2e0d75113cf7c1095181a98..18ea7194e10289d943b19ec0a58b4773253ee923 100644 (file)
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -28,23 +28,18 @@
 #define INCLUDED_numeric_h
 
 #include "config.h"
-
-/*
- * form_str - return a format string for a message number
- * messages are defined below
- */
-extern const char *form_str(int);
+#include "messages.h"
 
 /*
  * Reserve numerics 000-099 for server-client connections where the client
  * is local to the server. If any server is passed a numeric in this range
  * from another server then it is remapped to 100-199. -avalon
  */
-#define RPL_WELCOME          001
-#define RPL_YOURHOST         002
-#define RPL_CREATED          003
-#define RPL_MYINFO           004
-#define RPL_ISUPPORT         005
+#define RPL_WELCOME          1
+#define RPL_YOURHOST         2
+#define RPL_CREATED          3
+#define RPL_MYINFO           4
+#define RPL_ISUPPORT         5
 
 #define RPL_SNOMASK         8
 
@@ -78,7 +73,7 @@ extern const char *form_str(int);
 #define RPL_STATSYLINE       218
 #define RPL_ENDOFSTATS       219
 /* note ircu uses 217 for STATSPLINE frip. conflict
- * as RPL_STATSQLINE was used in old 2.8 for Q line 
+ * as RPL_STATSQLINE was used in old 2.8 for Q line
  * I'm going to steal 220 for now *sigh*
  * -Dianora
  */
@@ -155,6 +150,7 @@ extern const char *form_str(int);
 #define RPL_LIST             322
 #define RPL_LISTEND          323
 #define RPL_CHANNELMODEIS    324
+#define RPL_CHANNELMLOCK     325 /* from sorircd 1.3 --nenolod */
 
 #define RPL_CHANNELURL       328 /* to be sent by services */
 
@@ -164,6 +160,7 @@ extern const char *form_str(int);
 #define RPL_NOTOPIC          331
 #define RPL_TOPIC            332
 #define RPL_TOPICWHOTIME     333
+#define RPL_WHOISTEXT        337
 #define RPL_WHOISACTUALLY    338
 
 #define RPL_INVITING         341
@@ -296,6 +293,8 @@ extern const char *form_str(int);
 
 #define ERR_NOOPERHOST       491
 
+#define ERR_OWNMODE          494 /* from bahamut -- jilles */
+
 #define ERR_UMODEUNKNOWNFLAG 501
 #define ERR_USERSDONTMATCH   502
 
@@ -303,7 +302,7 @@ extern const char *form_str(int);
 
 #define ERR_USERNOTONSERV    504
 
-/* #define ERR_LAST_ERR_MSG 505 
+/* #define ERR_LAST_ERR_MSG 505
  * moved to 999
  */
 #define ERR_WRONGPONG       513
@@ -312,8 +311,11 @@ extern const char *form_str(int);
 
 #define ERR_HELPNOTFOUND     524
 
+#define RPL_STARTTLS         670 /* ircv3.atheme.org tls-3.1 */
 #define RPL_WHOISSECURE      671 /* Unreal3.2 --nenolod */
 
+#define ERR_STARTTLS         691 /* ircv3.atheme.org tls-3.2 */
+
 #define RPL_MODLIST          702
 #define RPL_ENDOFMODLIST     703
 
@@ -361,6 +363,11 @@ extern const char *form_str(int);
 #define RPL_RSACHALLENGE2       740
 #define RPL_ENDOFRSACHALLENGE2  741
 
+#define ERR_MLOCKRESTRICTED    742
+#define ERR_INVALIDBAN         743
+
+#define ERR_TOPICLOCK          744 /* inspircd */
+
 #define RPL_SCANMATCHED                750
 #define RPL_SCANUMODES         751
 
@@ -373,6 +380,7 @@ extern const char *form_str(int);
 #define ERR_SASLTOOLONG                905
 #define ERR_SASLABORTED                906
 #define ERR_SASLALREADY                907
+#define RPL_SASLMECHS          908
 
 #define ERR_LAST_ERR_MSG     999