Changeset e277e80 for nick.c

Timestamp:

2013-04-20T22:50:31Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c608891

Parents:

dd95ce4

Message:

Add irc_t* argument to all relevant nick_*() functions.

File:

• nick.c (modified) (11 diffs)

nick.c

@@ -51 +51 @@
 {
         char *store_handle, *store_nick = g_malloc( MAX_NICK_LENGTH + 1 );
+        irc_t *irc = (irc_t *) acc->bee->ui_data;
         
         store_handle = clean_handle( handle );
         store_nick[MAX_NICK_LENGTH] = '\0';
         strncpy( store_nick, nick, MAX_NICK_LENGTH );
-        nick_strip( store_nick );
+        nick_strip( irc, store_nick );
         
         g_hash_table_replace( acc->nicks, store_handle, store_nick );
@@ -69 +70 @@
         static char nick[MAX_NICK_LENGTH+1];
         char *store_handle, *found_nick;
+        irc_t *irc = (irc_t *) bu->bee->ui_data;
         
         memset( nick, 0, MAX_NICK_LENGTH + 1 );
@@ -94 +96 @@
                                 *(s++) = 0;
                 
-                nick_strip( nick );
+                nick_strip( irc, nick );
                 if( set_getbool( &bu->bee->set, "lcnicks" ) )
-                        nick_lc( nick );
+                        nick_lc( irc, nick );
         }
         g_free( store_handle );
@@ -230 +232 @@
         /* Now, find out if the nick is already in use at the moment, and make
            subtle changes to make it unique. */
-        while( !nick_ok( nick ) ||
+        while( !nick_ok( irc, nick ) ||
                ( ( iu = irc_user_by_name( irc, nick ) ) && iu->bu != bu ) )
         {
@@ -287 +289 @@
 
 
-void nick_strip( char *nick )
+void nick_strip( irc_t *irc, char *nick )
 {
         int i, j;
@@ -313 +315 @@
 }
 
-int nick_ok( const char *nick )
+int nick_ok( irc_t *irc, const char *nick )
 {
         const char *s;
@@ -328 +330 @@
 }
 
-int nick_lc( char *nick )
+int nick_lc( irc_t *irc, char *nick )
 {
         static char tab[128] = { 0 };
@@ -351 +353 @@
 }
 
-int nick_uc( char *nick )
+int nick_uc( irc_t *irc, char *nick )
 {
         static char tab[128] = { 0 };
@@ -374 +376 @@
 }
 
-int nick_cmp( const char *a, const char *b )
+int nick_cmp( irc_t *irc, const char *a, const char *b )
 {
         char aa[1024] = "", bb[1024] = "";
@@ -380 +382 @@
         strncpy( aa, a, sizeof( aa ) - 1 );
         strncpy( bb, b, sizeof( bb ) - 1 );
-        if( nick_lc( aa ) && nick_lc( bb ) )
+        if( nick_lc( irc, aa ) && nick_lc( irc, bb ) )
         {
                 return( strcmp( aa, bb ) );
@@ -389 +391 @@
         }
 }
-
-char *nick_dup( const char *nick )
-{
-        return g_strndup( nick, MAX_NICK_LENGTH );
-}