[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Fri Oct 12 02:46:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-12 07:45:58 UTC
Commited by: Tothwolf <tothwolf at techmonkeys.org>

Modified files:
     src/irccmp.h src/match.c src/modules.c src/proto.h

Log message:

* More irccmp/irctoupper fixes

---------------------- diff included ----------------------
Index: eggdrop1.7/src/irccmp.h
diff -u eggdrop1.7/src/irccmp.h:1.1 eggdrop1.7/src/irccmp.h:1.2
--- eggdrop1.7/src/irccmp.h:1.1	Thu Oct 11 13:24:01 2001
+++ eggdrop1.7/src/irccmp.h	Fri Oct 12 02:45:48 2001
@@ -2,7 +2,7 @@
  * irccmp.h
  *   prototypes and macros for irccmp.c
  *
- * $Id: irccmp.h,v 1.1 2001/10/11 18:24:01 tothwolf Exp $
+ * $Id: irccmp.h,v 1.2 2001/10/12 07:45:48 tothwolf Exp $
  */
 /*
  * Copyright (C) 1990 Jarkko Oikarinen
@@ -25,6 +25,11 @@
 #ifndef _EGG_IRCCMP_H
 #define _EGG_IRCCMP_H
 
+
+extern int (*irccmp) (const char *, const char *);
+extern int (*ircncmp) (const char *, const char *, int);
+extern int (*irctoupper) (int);
+extern int (*irctolower) (int);
 
 /*
  * prototypes
Index: eggdrop1.7/src/match.c
diff -u eggdrop1.7/src/match.c:1.8 eggdrop1.7/src/match.c:1.9
--- eggdrop1.7/src/match.c:1.8	Thu Oct 11 21:27:45 2001
+++ eggdrop1.7/src/match.c	Fri Oct 12 02:45:48 2001
@@ -2,7 +2,7 @@
  * match.c
  *   wildcard matching functions
  *
- * $Id: match.c,v 1.8 2001/10/12 02:27:45 stdarg Exp $
+ * $Id: match.c,v 1.9 2001/10/12 07:45:48 tothwolf Exp $
  */
 /*
  * Once this code was working, I added support for % so that I could
@@ -102,7 +102,7 @@
       sofar &= UNQUOTED;	/* Remember not quoted */
     } else
       sofar |= QUOTED;		/* Remember quoted */
-    if (_irctoupper(*m) == _irctoupper(*n)) {	/* If matching char */
+    if (irctoupper(*m) == irctoupper(*n)) {	/* If matching char */
       m--;
       n--;
       sofar++;			/* Tally the match */
@@ -204,7 +204,7 @@
       case QUOTE:
 	m++;			/* Handle quoting */
       }
-      if (_irctoupper(*m) == _irctoupper(*n)) {		/* If matching */
+      if (irctoupper(*m) == irctoupper(*n)) {		/* If matching */
 	m++;
 	n++;
 	sofar++;
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.65 eggdrop1.7/src/modules.c:1.66
--- eggdrop1.7/src/modules.c:1.65	Thu Oct 11 13:24:01 2001
+++ eggdrop1.7/src/modules.c	Fri Oct 12 02:45:48 2001
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.65 2001/10/11 18:24:01 tothwolf Exp $
+ * $Id: modules.c,v 1.66 2001/10/12 07:45:48 tothwolf Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -135,11 +135,11 @@
 void (*sharein) (int, char *) = null_share;
 void (*qserver) (int, char *, int) = (void (*)(int, char *, int)) null_func;
 void (*add_mode) () = null_func;
-int (*match_noterej) (struct userrec *, char *) = (int (*)(struct userrec *, char *)) false_func;
 int (*irccmp) (const char *, const char *) = _irccmp;
 int (*ircncmp) (const char *, const char *, int) = _ircncmp;
 int (*irctolower) (int) = _irctolower;
 int (*irctoupper) (int) = _irctoupper;
+int (*match_noterej) (struct userrec *, char *) = (int (*)(struct userrec *, char *)) false_func;
 
 module_entry *module_list;
 dependancy *dependancy_list = NULL;
@@ -800,7 +800,6 @@
 	ircncmp = _ircncmp;
 	irctolower = _irctolower;
 	irctoupper = _irctoupper;
-
       }
       break;
     case HOOK_MATCH_NOTEREJ:
Index: eggdrop1.7/src/proto.h
diff -u eggdrop1.7/src/proto.h:1.53 eggdrop1.7/src/proto.h:1.54
--- eggdrop1.7/src/proto.h:1.53	Thu Oct 11 13:24:01 2001
+++ eggdrop1.7/src/proto.h	Fri Oct 12 02:45:48 2001
@@ -7,7 +7,7 @@
  * because they use structures in those
  * (saves including those .h files EVERY time) - Beldin
  *
- * $Id: proto.h,v 1.53 2001/10/11 18:24:01 tothwolf Exp $
+ * $Id: proto.h,v 1.54 2001/10/12 07:45:48 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -49,13 +49,11 @@
 struct list_type;
 struct tand_t_struct;
 
-#if !defined(MAKING_MODS)
+#ifndef MAKING_MODS
 extern void (*encrypt_pass) (char *, char *);
 extern char *(*encrypt_string) (char *, char *);
 extern char *(*decrypt_string) (char *, char *);
 extern int (*match_noterej) (struct userrec *, char *);
-extern int (*irccmp)(const char *, const char *);
-extern int (*ircncmp)(const char *, const char *, int);
 #endif
 
 /* botcmd.c */
----------------------- End of diff -----------------------



More information about the Changes mailing list