luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

strfuncs: Use a GPtrArray in strsplit()

Browse Source 
This is more efficient and also much easier since we already have the
memory allocated that we're going to return from the function. No need
to do that ourselves or reverse a list.
This commit is contained in:
Timm Bäder 2020-06-05 05:29:01 +02:00
parent c93318953e
commit a2e715a4fe
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glib/gstrfuncs.c
View File

@ -35,6 +35,7 @@
#include <string.h>
#include <locale.h>
#include <errno.h>
#include <garray.h>
#include <ctype.h> /* For tolower() */
#ifdef HAVE_XLOCALE_H
@ -2352,10 +2353,9 @@ g_strsplit (const gchar *string,
const gchar *delimiter,
gint max_tokens)
{
GSList *string_list = NULL, *slist;
gchar **str_array, *s;
guint n = 0;
char *s;
const gchar *remainder;
GPtrArray *string_list;
g_return_val_if_fail (string != NULL, NULL);
g_return_val_if_fail (delimiter != NULL, NULL);
@ -2364,6 +2364,7 @@ g_strsplit (const gchar *string,
if (max_tokens < 1)
max_tokens = G_MAXINT;
string_list = g_ptr_array_new ();
remainder = string;
s = strstr (remainder, delimiter);
if (s)
@ -2375,28 +2376,17 @@ g_strsplit (const gchar *string,
gsize len;
len = s - remainder;
string_list = g_slist_prepend (string_list,
g_strndup (remainder, len));
n++;
g_ptr_array_add (string_list, g_strndup (remainder, len));
remainder = s + delimiter_len;
s = strstr (remainder, delimiter);
}
}
if (*string)
{
n++;
string_list = g_slist_prepend (string_list, g_strdup (remainder));
}
g_ptr_array_add (string_list, g_strdup (remainder));
str_array = g_new (gchar*, n + 1);
g_ptr_array_add (string_list, NULL);
str_array[n--] = NULL;
for (slist = string_list; slist; slist = slist->next)
str_array[n--] = slist->data;
g_slist_free (string_list);
return str_array;
return (char **) g_ptr_array_free (string_list, FALSE);
}
/**