X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-macros.h;h=dc18641d072f47b6220ecc08cca3d838240476ed;hb=5d88030bd1a197041f84530a88c2590e6bb1bbb1;hp=bd63ec495f7253f8b20dd9a006e794b1158d7626;hpb=a9175145462335ef69dbc2509e2db6f2c96e635c;p=ngircd-alex.git

diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h
index bd63ec49..dc18641d 100644
--- a/src/ngircd/irc-macros.h
+++ b/src/ngircd/irc-macros.h
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,18 @@
  * Macros for functions that handle IRC commands.
  */
 
+/**
+ * Make sure that number of passed parameters is equal to Count.
+ *
+ * If there are not exactly Count parameters, send an error to the client and
+ * return from the function.
+ */
+#define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \
+if (Req->argc != Count) { \
+	return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+				  Client_ID(Client), Req->command); \
+}
+
 /**
  * Make sure that number of passed parameters is less or equal than Max.
  *
@@ -24,9 +36,10 @@
  * return from the function.
  */
 #define _IRC_ARGC_LE_OR_RETURN_(Client, Req, Max) \
-if (Req->argc > Max) \
-	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+if (Req->argc > Max) { \
+	return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Make sure that number of passed parameters is greater or equal than Min.
@@ -35,9 +48,22 @@ if (Req->argc > Max) \
  * return from the function.
  */
 #define _IRC_ARGC_GE_OR_RETURN_(Client, Req, Min) \
-if (Req->argc < Min) \
-	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+if (Req->argc < Min) { \
+	return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+				  Client_ID(Client), Req->command); \
+}
+
+/**
+ * Make sure that number of passed parameters is in between Min and Max.
+ *
+ * If there aren't at least Min parameters or if there are more than Max
+ * parameters, send an error to the client and return from the function.
+ */
+#define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \
+if (Req->argc < Min || Req->argc > Max) { \
+	return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Get sender of an IRC command.
@@ -52,7 +78,7 @@ if (Req->argc < Min) \
 	else \
 		Sender = Client; \
 	if (!Sender) \
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, \
+		return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG, \
 					  Client_ID(Client), Req->prefix);
 
 /**
@@ -71,7 +97,7 @@ if (Req->argc < Min) \
 		if (!Target) \
 			Target = Client_SearchServer(Req->argv[Argc]); \
 		if (!Target) \
-			return IRC_WriteStrClient(From, ERR_NOSUCHSERVER_MSG, \
+			return IRC_WriteErrClient(From, ERR_NOSUCHSERVER_MSG, \
 					  Client_ID(From), Req->argv[Argc]); \
 		if (Client_Type(Target) != CLIENT_SERVER) \
 			Target = Client_Introducer(Target); \