CLEANUP of struct.h

diff --git a/include/struct.h b/include/struct.h
index 889c69b95ee5da0a943103c463e96c1706f5330d..a6a36373c1fcb378adc5c8575db177641502268e 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -68,22 +68,13 @@ typedef unsigned int  u_int32_t; /* XXX Hope this works! */
 #include "dbuf.h"      /* THIS REALLY SHOULDN'T BE HERE!!! --msa */
 
 #define        ARGLEN          132     /* Argument length for events  -taz        */
-#define        HOSTLEN         63      /* Length of hostname.  Updated to         */
-                               /* comply with RFC1123                     */
-
-#define        NICKLEN         30      /* Necessary to put 9 here instead of 10
-                               ** if s_msg.c/m_nick has been corrected.
-                               ** This preserves compatibility with old
-                               ** servers --msa
-                               */
+#define        HOSTLEN         63      /* Length of hostname */
+#define        NICKLEN         30
 #define        USERLEN         10
 #define        REALLEN         50
 #define        TOPICLEN        307
-/* DAL MADE ME PUT THIS IN THE FIEND:  --Russell
- * This number will be expanded to 200 in the near future
- */
 #define        CHANNELLEN      32
-#define        PASSWDLEN       32      /* orig. 20, changed to 32 for nickpasswords */
+#define        PASSWDLEN       32
 #define        KEYLEN          23
 #define        BUFSIZE         512             /* WARNING: *DONT* CHANGE THIS!!!! */
 #define        MAXRECIPIENTS   20
@@ -200,10 +191,6 @@ typedef unsigned int  u_int32_t; /* XXX Hope this works! */
 
 #define FLAGS2_HTC     0x00000001 /* Protect a user from getting killed with dead socket */
 
-/* Dec 26th, 1997 - having a go at
- * splitting flags into flags and umodes
- * -DuffJ
- */
 #define FLAGS2_ZIP       0x00000002
 #define FLAGS2_ZIPFIRST  0x00000004
 #define FLAGS2_CAPAB_ZIP 0x00000008
@@ -459,13 +446,6 @@ typedef unsigned int  u_int32_t; /* XXX Hope this works! */
 #define IsPing(x)               ((x)->status == STAT_PING)
 #define SetPing(x)              ((x)->status = STAT_PING)
 
-/*
- * defines for curses in client
- */
-#define        DUMMY_TERM      0
-#define        CURSES_TERM     1
-#define        TERMCAP_TERM    2
-
 struct  SqlineItem     {
        unsigned int    status;
        char *sqline;

diff --git a/src/s_user.c b/src/s_user.c
index a4fe2610b705f062dbb9564113f267f693c76bf8..fe485c6f8fc069ffeda6b9ca5daea93b6036d1d1 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -21,7 +21,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "config.h"              /* Get the value of THROTTLE -Studded */
+#include "config.h"
 #include "struct.h"
 #include "common.h"
 #include "sys.h"