Changeset e6ef4a8

Timestamp:

2015-03-15T14:41:48Z (9 years ago)

Author:

dequis <dx@…>

Children:

c408298

Parents:

e2bf725

git-author:

dequis <dx@…> (13-03-15 07:50:24)

git-committer:

dequis <dx@…> (15-03-15 14:41:48)

Message:

msn: remove msn_linesplit, use g_strsplit_set instead

Location:

protocols/msn

Files:

• msn.h (modified) (1 diff)
• msn_util.c (modified) (3 diffs)

protocols/msn/msn.h

@@ -248 +248 @@
 int msn_buddy_list_remove(struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *group);
 void msn_buddy_ask(bee_user_t *bu);
-char **msn_linesplit(char *line);
 int msn_handler(struct msn_data *h);
 char *msn_p11_challenge(char *challenge);

protocols/msn/msn_util.c

@@ -166 +166 @@
 }
 
-/* *NOT* thread-safe, but that's not a problem for now... */
-char **msn_linesplit(char *line)
-{
-        static char **ret = NULL;
-        static int size = 3;
-        int i, n = 0;
-
-        if (ret == NULL) {
-                ret = g_new0(char*, size);
-        }
-
-        for (i = 0; line[i] && line[i] == ' '; i++) {
-                ;
-        }
-        if (line[i]) {
-                ret[n++] = line + i;
-                for (i++; line[i]; i++) {
-                        if (line[i] == ' ') {
-                                line[i] = 0;
-                        } else if (line[i] != ' ' && !line[i - 1]) {
-                                ret[n++] = line + i;
-                        }
-
-                        if (n >= size) {
-                                ret = g_renew(char*, ret, size += 2);
-                        }
-                }
-        }
-        ret[n] = NULL;
-
-        return(ret);
-}
-
 /* This one handles input from a MSN Messenger server. Both the NS and SB servers usually give
    commands, but sometimes they give additional data (payload). This function tries to handle
@@ -237 +204 @@
 
                                         cmd_text = g_strndup(h->rxq, i);
-                                        cmd = msn_linesplit(cmd_text);
-                                        for (count = 0; cmd[count]; count++) {
-                                                ;
-                                        }
+                                        cmd = g_strsplit_set(cmd_text, " ", -1);
+                                        count = g_strv_length(cmd);
+
                                         st = msn_ns_command(h, cmd, count);
+
+                                        g_strfreev(cmd);
                                         g_free(cmd_text);
 
@@ -277 +245 @@
 
                         msg = g_strndup(h->rxq, h->msglen);
-                        cmd = msn_linesplit(h->cmd_text);
-                        for (count = 0; cmd[count]; count++) {
-                                ;
-                        }
+
+                        cmd = g_strsplit_set(h->cmd_text, " ", -1);
+                        count = g_strv_length(cmd);
 
                         st = msn_ns_message(h, msg, h->msglen, cmd, count);
+
+                        g_strfreev(cmd);
                         g_free(msg);
                         g_free(h->cmd_text);