Changes in nick.c [e3e2059:5ebff60]

File:

• nick.c (modified) (2 diffs)

nick.c

@@ -214 +214 @@
 }
 
-/* Used for nicks and channel names too! */
-void underscore_dedupe(char nick[MAX_NICK_LENGTH + 1])
-{
-        if (strlen(nick) < (MAX_NICK_LENGTH - 1)) {
-                nick[strlen(nick) + 1] = 0;
-                nick[strlen(nick)] = '_';
-        } else {
-                /* We've got no more space for underscores,
-                   so truncate it and replace the last three
-                   chars with a random "_XX" suffix */
-                int len = truncate_utf8(nick, MAX_NICK_LENGTH - 3);
-                nick[len] = '_';
-                g_snprintf(nick + len + 1, 3, "%2x", rand());
-        }
-}
-
 void nick_dedupe(bee_user_t *bu, char nick[MAX_NICK_LENGTH + 1])
 {
@@ -240 +224 @@
         while (!nick_ok(irc, nick) ||
                ((iu = irc_user_by_name(irc, nick)) && iu->bu != bu)) {
-
-                underscore_dedupe(nick);
+                if (strlen(nick) < (MAX_NICK_LENGTH - 1)) {
+                        nick[strlen(nick) + 1] = 0;
+                        nick[strlen(nick)] = '_';
+                } else {
+                        /* We've got no more space for underscores,
+                           so truncate it and replace the last three
+                           chars with a random "_XX" suffix */
+                        int len = truncate_utf8(nick, MAX_NICK_LENGTH - 3);
+                        nick[len] = '_';
+                        g_snprintf(nick + len + 1, 3, "%2x", rand());
+                }
 
                 if (inf_protection-- == 0) {