- Hmpf. "Verfruehtes" CVS-Update einiger Source-Files zurueckgenommen ...

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

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index 21355f3d2a7bff3f9b41c25d800a11283c8ec0dd..0f27cab36013a1fcc3f260ee6c0fd7bb2e1c75cd 100644 (file)
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: lists.c,v 1.5 2002/08/26 23:39:22 alex Exp $
+ * $Id: lists.c,v 1.6 2002/08/26 23:47:58 alex Exp $
  *
  * lists.c: Verwaltung der "IRC-Listen": Ban, Invite, ...
  */
@@ -25,7 +25,6 @@
 #include "client.h"
 #include "channel.h"
 #include "log.h"
-#include "match.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -103,8 +102,7 @@ Lists_CheckInvited( CLIENT *Client, CHANNEL *Chan )
                if( c2c->channel == Chan )
                {
                        /* Ok, richtiger Channel. Passt die Maske? */
-Log( LOG_DEBUG, "%s : %s", Client_Mask( Client ), c2c->mask );
-                       if( Match( Client_Mask( Client ), c2c->mask ))
+                       if( strcasecmp( Client_Mask( Client ), c2c->mask ) == 0 )
                        {
                                /* Treffer! */
                                if( c2c->onlyonce )
@@ -126,14 +124,14 @@ Log( LOG_DEBUG, "%s : %s", Client_Mask( Client ), c2c->mask );
 
 
 GLOBAL BOOLEAN
-Lists_AddInvited( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
+Lists_AddInvited( CHAR *Pattern, CHANNEL *Chan, BOOLEAN OnlyOnce )
 {
        C2C *c2c;
 
-       assert( Mask != NULL );
+       assert( Pattern != NULL );
        assert( Chan != NULL );
 
-       c2c = New_C2C( Mask, Chan, OnlyOnce );
+       c2c = New_C2C( Pattern, Chan, OnlyOnce );
        if( ! c2c )
        {
                Log( LOG_ERR, "Can't add new invite list entry!" );
@@ -144,7 +142,7 @@ Lists_AddInvited( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
        c2c->next = My_Invites;
        My_Invites = c2c;
 
-       Log( LOG_DEBUG, "Added \"%s\" to invite list for \"%s\".", Mask, Channel_Name( Chan ));
+       Log( LOG_DEBUG, "Added \"%s\" to invite list for \"%s\".", Pattern, Channel_Name( Chan ));
        return TRUE;
 } /* Lists_AddInvited */
 
@@ -202,18 +200,6 @@ Lists_DeleteChannel( CHANNEL *Chan )
 } /* Lists_DeleteChannel */
 
 
-GLOBAL CHAR *
-Lists_MakeMask( CHAR *Pattern )
-{
-       assert( Pattern );
-
-       /* Hier sollte aus einem "beliebigen" Pattern eine
-        * gueltige IRC-Mask erzeugt werden ... */
-       
-       return Pattern;
-} /* Lists_MakeMask */
-
-
 LOCAL C2C *
 New_C2C( CHAR *Mask, CHANNEL *Chan, BOOLEAN OnlyOnce )
 {