Index: Changes

===================================================================
RCS file: /home/cmunk/ircsystems/cvsroot/unreal/Changes,v
retrieving revision 1.1.1.1.2.1.2.1.2.2394
diff -u -r1.1.1.1.2.1.2.1.2.2394 Changes
--- Changes	13 May 2007 16:48:38 -0000	1.1.1.1.2.1.2.1.2.2394
+++ Changes	13 May 2007 17:56:05 -0000
@@ -1666,3 +1666,4 @@
 - A bug was introduced in the patch for #0003139. Patched by WolfSage
 - #0002533 reported by Dodge_Ram, patched by WolfSage, regarding notices
   not being sent when /*line and /shun are used to request stats
+- Removed class.h and minor references to aClass. Patched by WolfSage

diff --git a/Changes b/Changes
index e15fcb82fa9d327a66a04a4fe5a99e6ab2e314e6..eccbdae355e7ed6f669adc170474c56766112cea 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1666,3 +1666,4 @@ MOTDs
 - A bug was introduced in the patch for #0003139. Patched by WolfSage
 - #0002533 reported by Dodge_Ram, patched by WolfSage, regarding notices 
   not being sent when /*line and /shun are used to request stats 
+- Removed class.h and minor references to aClass. Patched by WolfSage

diff --git a/include/class.h b/include/class.h
deleted file mode 100644 (file)
index 9db5209..0000000
--- a/include/class.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/************************************************************************
- *   Unreal Internet Relay Chat Daemon, include/class.h
- *   Copyright (C) 1990 Darren Reed
- *
- *   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
- *   the Free Software Foundation; either version 1, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *  
- *   $Id$
- */
-
-#ifndef        __class_include__
-#define __class_include__
-
-typedef struct Class {
-       int  class;
-       int  conFreq;
-       int  pingFreq;
-       int  maxLinks;
-       long maxSendq;
-       int  links;
-       struct Class *next;
-} aClass;
-
-#define        Class(x)        ((x)->class)
-#define        ConFreq(x)      ((x)->conFreq)
-#define        PingFreq(x)     ((x)->pingFreq)
-#define        MaxLinks(x)     ((x)->maxLinks)
-#define        MaxSendq(x)     ((x)->maxSendq)
-#define        Links(x)        ((x)->links)
-
-#define        ConfLinks(x)    (Class(x)->links)
-#define        ConfMaxLinks(x) (Class(x)->maxLinks)
-#define        ConfClass(x)    (Class(x)->class)
-#define        ConfConFreq(x)  (Class(x)->conFreq)
-#define        ConfPingFreq(x) (Class(x)->pingFreq)
-#define        ConfSendq(x)    (Class(x)->maxSendq)
-
-#define        FirstClass()    classes
-#define        NextClass(x)    ((x)->next)
-
-extern aClass *classes;
-
-extern aClass *find_class(int);
-extern int get_conf_class(aConfItem *);
-extern int get_client_class(aClient *);
-extern int get_client_ping(aClient *);
-extern int get_con_freq(aClass *);
-extern void add_class(int, int, int, int, long);
-extern void check_class(void);
-extern void initclass(void);
-
-#endif /* __class_include__ */

diff --git a/include/h.h b/include/h.h
index 88600d970d9e9e94ce909698a23b99060b8ebcfc..8056d3564e404b8c5faa3f61f3a388065c2bc5d6 100644 (file)
--- a/include/h.h
+++ b/include/h.h
@@ -355,14 +355,12 @@ extern void send_umode_out(aClient *, aClient *, long);
 extern void free_client(aClient *);
 extern void free_link(Link *);
 extern void free_ban(Ban *);
-extern void free_class(aClass *);
 extern void free_user(anUser *, aClient *);
 extern int find_str_match_link(Link *, char *);
 extern void free_str_list(Link *);
 extern Link *make_link();
 extern Ban *make_ban();
 extern anUser *make_user(aClient *);
-extern aClass *make_class();
 extern aServer *make_server();
 extern aClient *make_client(aClient *, aClient *);
 extern Link *find_user_link(Link *, aClient *);

diff --git a/include/struct.h b/include/struct.h
index a8ec254c4d2bbc39ac91094bd90810f48ed69209..3602eccdd3e74c7735255476cbd750640deaaccb 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -158,7 +158,6 @@ typedef unsigned int u_int32_t;     /* XXX Hope this works! */
 #endif
 
 #ifndef VMSP
-#include "class.h"
 #include "dbuf.h"              /* THIS REALLY SHOULDN'T BE HERE!!! --msa */
 #endif
 

diff --git a/makefile.win32 b/makefile.win32
index be2e384e47e3bbe4b50f531e048169a1d32c570c..31c484fb4f8972bc9934b9e3d7f5d63f720cd8b2 100644 (file)
--- a/makefile.win32
+++ b/makefile.win32
@@ -296,9 +296,6 @@ src/support.obj: src/support.c $(INCLUDES)
 src/channel.obj: src/channel.c $(INCLUDES) ./include/channel.h
         $(CC) $(CFLAGS) src/channel.c
 
-src/class.obj: src/class.c $(INCLUDES) ./include/class.h
-        $(CC) $(CFLAGS) src/class.c
-
 src/lusers.obj: src/lusers.c $(INCLUDES)
         $(CC) $(CFLAGS) src/lusers.c
 

diff --git a/src/Makefile b/src/Makefile
index 99bf35813179632a905b8879b0a5bc3ee2f16c6d..24ed46bf3e885b1631a80ea485b1047383ee5515 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,7 +44,7 @@ MAKEARGS =    'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
 MAKE = make $(MAKEARGS)
 
 INCLUDES = ../include/auth.h ../include/badwords.h ../include/channel.h \
-       ../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \
+       ../include/common.h ../include/config.h ../include/dbuf.h \
        ../include/dynconf.h ../include/events.h ../include/fdlist.h ../include/h.h \
        ../include/hash.h ../include/inet.h ../include/ircsprintf.h \
        ../include/license.h ../include/macros.h ../include/md5.h \

diff --git a/src/list.c b/src/list.c
index 0680d19213acb67e3cd1ba1db3b823297f31ac92..7e7d0e054a689f3051b65ba86b4fbaacc8a61105 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -57,7 +57,7 @@ ID_Notes("2.24 4/20/94");
 #ifdef DEBUGMODE
 static struct liststats {
        int  inuse;
-} cloc, crem, users, servs, links, classs, aconfs;
+} cloc, crem, users, servs, links, aconfs;
 
 #endif
 
@@ -79,7 +79,6 @@ void initlists(void)
        bzero((char *)&users, sizeof(users));
        bzero((char *)&servs, sizeof(servs));
        bzero((char *)&links, sizeof(links));
-       bzero((char *)&classs, sizeof(classs));
 #endif
 }
 
@@ -471,25 +470,6 @@ void free_ban(Ban *lp)
 #endif
 }
 
-aClass *make_class(void)
-{
-       aClass *tmp;
-
-       tmp = (aClass *)MyMalloc(sizeof(aClass));
-#ifdef DEBUGMODE
-       classs.inuse++;
-#endif
-       return tmp;
-}
-
-void free_class(aClass *tmp)
-{
-       MyFree((char *)tmp);
-#ifdef DEBUGMODE
-       classs.inuse--;
-#endif
-}
-
 #ifdef DEBUGMODE
 void send_listinfo(aClient *cptr, char *name)
 {
@@ -518,12 +498,7 @@ void send_listinfo(aClient *cptr, char *name)
            me.name, RPL_STATSDEBUG, name, links.inuse,
            tmp = links.inuse * sizeof(Link));
        mem += tmp;
-       inuse += links.inuse,
-           sendto_one(cptr, ":%s %d %s :Classes: inuse: %d(%d)",
-           me.name, RPL_STATSDEBUG, name, classs.inuse,
-           tmp = classs.inuse * sizeof(aClass));
-       mem += tmp;
-       inuse += aconfs.inuse,
+       inuse += links.inuse + aconfs.inuse,
            sendto_one(cptr, ":%s %d %s :Totals: inuse %d %d",
            me.name, RPL_STATSDEBUG, name, inuse, mem);
 }

diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index d0c2b9301dac9d580c903de502ab132fc4f4b014..eb68b67ecf895a001dbcd474c78a0982a6df0a6b 100644 (file)
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -21,7 +21,7 @@
 # major edit from fez - to compile objects individually...
 
 INCLUDES = ../include/auth.h ../include/badwords.h ../include/channel.h \
-       ../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \
+       ../include/common.h ../include/config.h ../include/dbuf.h \
        ../include/dynconf.h ../include/events.h ../include/fdlist.h ../include/h.h \
        ../include/hash.h ../include/inet.h ../include/ircsprintf.h \
        ../include/license.h ../include/macros.h ../include/md5.h \

diff --git a/src/modules/chanmodes/Makefile.in b/src/modules/chanmodes/Makefile.in
index a1b71171d6578cda766d994170bb75facec1eba6..449ec6bbe29b68cba200e5af4901a59aab4de3c8 100644 (file)
--- a/src/modules/chanmodes/Makefile.in
+++ b/src/modules/chanmodes/Makefile.in
@@ -20,7 +20,7 @@
 #*/
 
 INCLUDES = ../include/auth.h ../include/badwords.h ../include/channel.h \
-       ../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \
+       ../include/common.h ../include/config.h ../include/dbuf.h \
        ../include/dynconf.h ../include/events.h ../include/fdlist.h ../include/h.h \
        ../include/hash.h ../include/inet.h ../include/ircsprintf.h \
        ../include/license.h ../include/macros.h ../include/md5.h \

diff --git a/src/modules/m_stats.c b/src/modules/m_stats.c
index 549cfd46d74ff12463da8d6d42eadae4723e2958..bb8608907c4ba759d2afd8e719e2502d88571a44 100644 (file)
--- a/src/modules/m_stats.c
+++ b/src/modules/m_stats.c
@@ -843,7 +843,6 @@ int stats_mem(aClient *sptr, char *para)
             chb = 0,           /* channel bans */
             wwu = 0,           /* whowas users */
             fl = 0,            /* free links */
-            cl = 0,            /* classes */
             co = 0;            /* conf lines */
 
        int  usi = 0,           /* users invited */
@@ -997,7 +996,7 @@ int stats_mem(aClient *sptr, char *para)
 /*     rm = cres_mem(sptr,sptr->name); */
        rm = 0; /* syzop: todo ?????????? */
 
-       tot = totww + totch + totcl + com + cl * sizeof(aClass) + db + rm;
+       tot = totww + totch + totcl + com + db + rm;
        tot += fl * sizeof(Link);
        tot += sizeof(aHashEntry) * U_MAX;
        tot += sizeof(aHashEntry) * CH_MAX;