Changeset d16e951 for irc_channel.c

Timestamp:

2015-04-06T11:27:35Z (10 years ago)

Author:

dequis <dx@…>

Children:

b3ebb3a

Parents:

1522faf

Message:

i bet this is seirl's fault

File:

• irc_channel.c (modified) (2 diffs)

irc_channel.c

@@ -588 +588 @@
 char *irc_channel_name_gen(bee_t *bee, const char *hint)
 {
-        char *name, *final_name;
-        gsize bytes_written;
-
-        name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
-        if (bytes_written > MAX_NICK_LENGTH) {
-                name[MAX_NICK_LENGTH] = '\0';
-        }
+        char name[MAX_NICK_LENGTH + 1] = { 0 };
+
+        name[0] = '#';
+        strncpy(name + 1, hint, MAX_NICK_LENGTH - 1);
+        name[MAX_NICK_LENGTH] = '\0';
 
         irc_channel_name_strip(name);
 
         if (set_getbool(&bee->set, "lcnicks")) {
-                nick_lc(bee->ui_data, name);
+                nick_lc(bee->ui_data, name + 1);
         }
 
@@ -606 +604 @@
         }
 
-        final_name = g_strconcat("#", name, NULL);
-
-        g_free(name);
-
-        return final_name;
+        return g_strdup(name);
 }