luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 13:53:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'strsplit-pre-allocated-array' into 'main'

Browse Source 
g_strsplit: Use a pre-allocated GArray when max_tokens is provided

See merge request GNOME/glib!2875
This commit is contained in:
Matthias Clasen 2022-09-06 17:15:03 +00:00
commit 1a32433f31
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gstrfuncs.c
View File

@ -2425,9 +2425,15 @@ g_strsplit (const gchar *string,
g_return_val_if_fail (delimiter[0] != '\0', NULL); g_return_val_if_fail (delimiter[0] != '\0', NULL);
if (max_tokens < 1) if (max_tokens < 1)
max_tokens = G_MAXINT; {
max_tokens = G_MAXINT;
string_list = g_ptr_array_new ();
}
else
{
string_list = g_ptr_array_new_full (max_tokens + 1, NULL);
}
string_list = g_ptr_array_new ();
remainder = string; remainder = string;
s = strstr (remainder, delimiter); s = strstr (remainder, delimiter);
if (s) if (s)