Remove imp.h and exp.h header files

[ngircd-alex.git] / src / ngircd / class.c

diff --git a/src/ngircd/class.c b/src/ngircd/class.c
index 0f617b8213d1ff3fe56a5cbf9babf58265080df9..df444fec115c9e3052982df102d18d8cfdc027c4 100644 (file)
--- a/src/ngircd/class.c
+++ b/src/ngircd/class.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2012 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,7 +16,6 @@
  * User class management.
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
@@ -28,13 +27,10 @@
 #include "match.h"
 #include "stdio.h"
 
-#include "exp.h"
 #include "class.h"
 
 struct list_head My_Classes[CLASS_COUNT];
 
-char Reject_Reason[COMMAND_LEN];
-
 GLOBAL void
 Class_Init(void)
 {
@@ -49,32 +45,31 @@ Class_Exit(void)
        for (i = 0; i < CLASS_COUNT; Lists_Free(&My_Classes[i++]));
 }
 
-GLOBAL char *
-Class_GetMemberReason(const int Class, CLIENT *Client)
+GLOBAL bool
+Class_GetMemberReason(const int Class, CLIENT *Client, char *reason, size_t len)
 {
-       char *reason;
+       char str[COMMAND_LEN];
 
        assert(Class < CLASS_COUNT);
        assert(Client != NULL);
 
-       reason = Lists_CheckReason(&My_Classes[Class], Client);
-       if (!reason)
-               return NULL;
+       strlcpy(str, "listed", sizeof(str));
 
-       if (!*reason)
-               reason = "listed";
+       if (!Lists_CheckReason(&My_Classes[Class], Client, str, sizeof(str)))
+               return false;
 
        switch(Class) {
                case CLASS_GLINE:
-                       snprintf(Reject_Reason, sizeof(Reject_Reason),
-                                "\"%s\" (G-Line)", reason);
-                       return Reject_Reason;
+                       snprintf(reason, len, "\"%s\" (G-Line)", str);
+                       break;
                case CLASS_KLINE:
-                       snprintf(Reject_Reason, sizeof(Reject_Reason),
-                                "\"%s\" (K-Line)", reason);
-                       return Reject_Reason;
+                       snprintf(reason, len, "\"%s\" (K-Line)", str);
+                       break;
+               default:
+                       snprintf(reason, len, "%s", str);
+                       break;
        }
-       return reason;
+       return true;
 }
 
 /**
@@ -88,15 +83,13 @@ Class_GetMemberReason(const int Class, CLIENT *Client)
 GLOBAL bool
 Class_HandleServerBans(CLIENT *Client)
 {
-       char *rejectptr;
+       char reject[COMMAND_LEN];
 
        assert(Client != NULL);
 
-       rejectptr = Class_GetMemberReason(CLASS_GLINE, Client);
-       if (!rejectptr)
-               rejectptr = Class_GetMemberReason(CLASS_KLINE, Client);
-       if (rejectptr) {
-               Client_Reject(Client, rejectptr, true);
+       if (Class_GetMemberReason(CLASS_GLINE, Client, reject, sizeof(reject)) ||
+           Class_GetMemberReason(CLASS_KLINE, Client, reject, sizeof(reject))) {
+               Client_Reject(Client, reject, true);
                return DISCONNECTED;
        }
 
@@ -105,24 +98,30 @@ Class_HandleServerBans(CLIENT *Client)
 
 
 GLOBAL bool
-Class_AddMask(const int Class, const char *Mask, time_t ValidUntil,
+Class_AddMask(const int Class, const char *Pattern, time_t ValidUntil,
              const char *Reason)
 {
+       char mask[MASK_LEN];
+
        assert(Class < CLASS_COUNT);
-       assert(Mask != NULL);
+       assert(Pattern != NULL);
        assert(Reason != NULL);
 
-       return Lists_Add(&My_Classes[Class], Lists_MakeMask(Mask),
+       Lists_MakeMask(Pattern, mask, sizeof(mask));
+       return Lists_Add(&My_Classes[Class], mask,
                         ValidUntil, Reason);
 }
 
 GLOBAL void
-Class_DeleteMask(const int Class, const char *Mask)
+Class_DeleteMask(const int Class, const char *Pattern)
 {
+       char mask[MASK_LEN];
+
        assert(Class < CLASS_COUNT);
-       assert(Mask != NULL);
+       assert(Pattern != NULL);
 
-       Lists_Del(&My_Classes[Class], Lists_MakeMask(Mask));
+       Lists_MakeMask(Pattern, mask, sizeof(mask));
+       Lists_Del(&My_Classes[Class], mask);
 }
 
 GLOBAL struct list_head *