Author: Isomer <isomer@coders.net>

[ircu2.10.12-pk.git] / ircd / s_err.c

diff --git a/ircd/s_err.c b/ircd/s_err.c
index a9ba4cd7a5495098ff7f7526b57ff01e1d647395..26794560e8cac477dc7d44e1844fe9268003b0e8 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -60,7 +60,7 @@ static Numeric local_replies[] = {
 /* 014 */
   { 0 },
 /* 015 */
-  { RPL_MAP, ":%s%s:%s (%is) [%i clients]", "015" },
+  { RPL_MAP, ":%s%s%s %s [%i clients]", "015" },
 /* 016 */
   { RPL_MAPMORE, ":%s%s --> *more*", "016" },
 /* 017 */
@@ -134,7 +134,7 @@ static Numeric numeric_errors[] = {
 /* 431 */
   { ERR_NONICKNAMEGIVEN, ":No nickname given", "431" },
 /* 432 */
-  { ERR_ERRONEUSNICKNAME, "%s :Erroneus Nickname", "432" },
+  { ERR_ERRONEUSNICKNAME, "%s :Erroneous Nickname", "432" },
 /* 433 */
   { ERR_NICKNAMEINUSE, "%s :Nickname is already in use.", "433" },
 /* 434 */
@@ -296,7 +296,13 @@ static Numeric numeric_errors[] = {
 /* 512 */
   { ERR_NOSUCHGLINE, "%s@%s :No such gline", "512" },
 /* 513 */
-  { ERR_BADPING, "", "513" }
+  { ERR_BADPING, "", "513" },
+/* 514 */
+  { ERR_NOSUCHJUPE, "%s :No such jupe", "514" },
+/* 515 */
+  { ERR_BADEXPIRE, TIME_T_FMT " :Bad expire time", "515" },
+/* 516 */
+  { ERR_DONTCHEAT, " :Don't Cheat.", 516 }
 };
 
 static Numeric numeric_replies[] = {
@@ -423,11 +429,11 @@ static Numeric numeric_replies[] = {
 /* 360 */
   { 0 },
 /* 361 */
-  { RPL_KILLDONE, 0, "361" },
+  { RPL_KILLDONE, 0, "361" }, /* Not used */
 /* 362 */
-  { RPL_CLOSING, "%s :Closed. Status = %d", "362" },
+  { RPL_CLOSING, "%s :Operator enforced Close", "362" },
 /* 363 */
-  { RPL_CLOSEEND, "%d: Connections Closed", "363" },
+  { RPL_CLOSEEND, "%d :Connections Closed", "363" },
 /* 364 */
 #ifndef GODMODE
   { RPL_LINKS, "%s %s :%d P%u %s", "364" },
@@ -473,9 +479,9 @@ static Numeric numeric_replies[] = {
 /* 383 */
   { 0 },
 /* 384 */
-  { RPL_MYPORTIS, "%d :Port to local server is", "384" },
+  { RPL_MYPORTIS, "%d :Port to local server is", "384" }, /* not used */
 /* 385 */
-  { RPL_NOTOPERANYMORE, 0, "385" },
+  { RPL_NOTOPERANYMORE, 0, "385" }, /* not used */
 /* 386 */
   { 0 },
 /* 387 */
@@ -672,8 +678,10 @@ static Numeric numeric_replies[] = {
   { RPL_GLIST, "%s@%s " TIME_T_FMT " %s%s", "280" },
 /* 281 */
   { RPL_ENDOFGLIST, ":End of G-line List", "281" },
+/* 282 */
+  { RPL_JUPELIST, "%s " TIME_T_FMT " %s %c :%s", "282" },
 /* 283 */
-  { 0 },
+  { RPL_ENDOFJUPELIST, ":End of Jupe List", "283" },
 /* 284 */
   { 0 }
 };
@@ -682,7 +690,7 @@ const struct Numeric* get_error_numeric(int numeric)
 {
   int num = numeric;
   assert(ERR_FIRSTERROR < num);
-  assert(num < ERR_INVALID_ERROR);
+  assert(num < ERR_LASTERROR);
 
   num -= ERR_FIRSTERROR;
   assert(0 != numeric_errors[num].value);