X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-cap.c;h=61e47f83d3350c863136057d6f2cf9c7b7d78757;hp=74c732271203ac0a49db6b9dde05b30dd1551dfc;hb=a13bb78b1e7adf7c261ac427341c397ef9a6a1ed;hpb=a53de63ba7fcb4144f4fcc2db221556177528900

diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c
index 74c73227..61e47f83 100644
--- a/src/ngircd/irc-cap.c
+++ b/src/ngircd/irc-cap.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 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
@@ -16,24 +16,19 @@
  * Handler for IRC capability ("CAP") commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
+#include <strings.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "client-cap.h"
-#include "irc-macros.h"
 #include "irc-write.h"
 #include "log.h"
 #include "login.h"
 #include "messages.h"
 #include "parse.h"
 
-#include "exp.h"
-#include "irc-cap.h"
-
 /* Local functions */
 
 /**
@@ -250,8 +245,6 @@ IRC_CAP(CLIENT *Client, REQUEST *Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	_IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
-
 	LogDebug("Got \"%s %s\" command from \"%s\" ...",
 		 Req->command, Req->argv[0], Client_ID(Client));
 
@@ -274,7 +267,7 @@ IRC_CAP(CLIENT *Client, REQUEST *Req)
 			return Handle_CAP_ACK(Client, Req->argv[1]);
 	}
 
-	return IRC_WriteStrClient(Client, ERR_INVALIDCAP_MSG,
+	return IRC_WriteErrClient(Client, ERR_INVALIDCAP_MSG,
 				  Client_ID(Client), Req->argv[0]);
 }