kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emergency-call-types: Use strv builder

Browse Source 
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/790>
This commit is contained in:
Guido Günther
2025-09-07 17:43:12 +02:00
committed by Marge Bot
parent 3e7f5e77ab
commit 52555030fb
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/calls-emergency-call-types.c
View File

@@ -318,8 +318,8 @@ calls_emergency_call_type_get_name (const char *lookup, const char *country_code
GStrv GStrv
calls_emergency_call_types_get_numbers_by_country_code (const char *country_code) calls_emergency_call_types_get_numbers_by_country_code (const char *country_code)
{ {
g_autoptr (GPtrArray) ret = g_ptr_array_new_with_free_func (g_free);
CallsEmergencyNumberTypes *match; CallsEmergencyNumberTypes *match;
g_autoptr (GStrvBuilder) builder = g_strv_builder_new ();
if (country_code == NULL) if (country_code == NULL)
return NULL; return NULL;
@@ -330,12 +330,8 @@ calls_emergency_call_types_get_numbers_by_country_code (const char *country_code
if (!match) if (!match)
return NULL; return NULL;
/* Can use g_strv_builder with glib > 2.68 */ for (int i = 0; i < G_N_ELEMENTS (match->numbers); i++)
for (int i = 0; i < G_N_ELEMENTS (match->numbers); i++) { g_strv_builder_add (builder, match->numbers[i].number);
char *number = g_strdup (match->numbers[i].number);
g_ptr_array_add (ret, number);
}
g_ptr_array_add (ret, NULL);
return (GStrv) g_ptr_array_steal (ret, NULL); return g_strv_builder_end (builder);
} }