Merge pull request #53 from ShadowNinja/clarify_U+R

[solanum.git] / src / class.c

diff --git a/src/class.c b/src/class.c
index 3810d53c3bfad95efa7ec9994dc28e15ddc50a94..a7eb528ac112bb31abb08afd0968358e707d149a 100644 (file)
--- a/src/class.c
+++ b/src/class.c
@@ -35,7 +35,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #define BAD_CONF_CLASS          -1
 #define BAD_PING                -2
@@ -49,7 +49,7 @@ make_class(void)
 {
        struct Class *tmp;
 
-       tmp = (struct Class *) rb_malloc(sizeof(struct Class));
+       tmp = rb_malloc(sizeof(struct Class));
 
        ConFreq(tmp) = DEFAULT_CONNECTFREQUENCY;
        PingFreq(tmp) = DEFAULT_PINGFREQUENCY;
@@ -199,7 +199,8 @@ add_class(struct Class *classptr)
                PingFreq(tmpptr) = PingFreq(classptr);
                MaxSendq(tmpptr) = MaxSendq(classptr);
                ConFreq(tmpptr) = ConFreq(classptr);
-               CidrBitlen(tmpptr) = CidrBitlen(classptr);
+               CidrIpv4Bitlen(tmpptr) = CidrIpv4Bitlen(classptr);
+               CidrIpv6Bitlen(tmpptr) = CidrIpv6Bitlen(classptr);
                CidrAmount(tmpptr) = CidrAmount(classptr);
 
                free_class(classptr);
@@ -239,7 +240,7 @@ find_class(const char *classname)
  *
  * inputs      - NONE
  * output      - NONE
- * side effects        - 
+ * side effects        -
  */
 void
 check_class()
@@ -266,7 +267,7 @@ check_class()
  *
  * inputs      - NONE
  * output      - NONE
- * side effects        - 
+ * side effects        -
  */
 void
 initclass()
@@ -292,11 +293,11 @@ report_classes(struct Client *source_p)
        {
                cltmp = ptr->data;
 
-               sendto_one_numeric(source_p, RPL_STATSYLINE, 
+               sendto_one_numeric(source_p, RPL_STATSYLINE,
                                form_str(RPL_STATSYLINE),
-                               ClassName(cltmp), PingFreq(cltmp), 
-                               ConFreq(cltmp), MaxUsers(cltmp), 
-                               MaxSendq(cltmp), 
+                               ClassName(cltmp), PingFreq(cltmp),
+                               ConFreq(cltmp), MaxUsers(cltmp),
+                               MaxSendq(cltmp),
                                MaxLocal(cltmp), MaxIdent(cltmp),
                                MaxGlobal(cltmp), MaxIdent(cltmp),
                                CurrUsers(cltmp));
@@ -304,9 +305,9 @@ report_classes(struct Client *source_p)
 
        /* also output the default class */
        sendto_one_numeric(source_p, RPL_STATSYLINE, form_str(RPL_STATSYLINE),
-                       ClassName(default_class), PingFreq(default_class), 
-                       ConFreq(default_class), MaxUsers(default_class), 
-                       MaxSendq(default_class), 
+                       ClassName(default_class), PingFreq(default_class),
+                       ConFreq(default_class), MaxUsers(default_class),
+                       MaxSendq(default_class),
                        MaxLocal(default_class), MaxIdent(default_class),
                        MaxGlobal(default_class), MaxIdent(default_class),
                        CurrUsers(default_class));