Changeset e3e2059 for nick.c

Timestamp:

2015-04-06T12:35:57Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

8bcd160

Parents:

69982f8

git-author:

dequis <dx@…> (06-04-15 12:30:30)

git-committer:

dequis <dx@…> (06-04-15 12:35:57)

Message:

irc: split bee_irc_chat_name_hint in a few functions

Also split underscore_dedupe from nick_dedupe.

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])
 {
@@ -224 +240 @@
         while (!nick_ok(irc, nick) ||
                ((iu = irc_user_by_name(irc, nick)) && iu->bu != bu)) {
-                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());
-                }
+
+                underscore_dedupe(nick);
 
                 if (inf_protection-- == 0) {