fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 14:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cloud-setup: use nm_strv_dup_packed() in nm_http_client_poll_get()

Browse source 
No need to do a deep clone. The strv array is not ever modified and we
pack it together in one memory allocation.

Conflicts: nm_strv_dup_packed is still called nm_utils_strv_dup_packed

(cherry picked from commit 599fe234ea)
(cherry picked from commit 3787eacac9)
(cherry picked from commit 89a6ce575d)
(cherry picked from commit d14dc95be3)
(cherry picked from commit 7e516418e0)
(cherry picked from commit becb47826a)
This commit is contained in:
Thomas Haller 2023-02-27 09:14:10 +01:00 • committed by Íñigo Huguet
parent 1885ff2c65
commit 4704e14100
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nm-cloud-setup/nm-http-client.c
View file

@ -413,7 +413,7 @@ _poll_get_data_free(gpointer data)
g_free(poll_get_data->uri); g_free(poll_get_data->uri);
nm_clear_pointer(&poll_get_data->response_data, g_bytes_unref); nm_clear_pointer(&poll_get_data->response_data, g_bytes_unref);
g_strfreev((char **) poll_get_data->http_headers); g_free((gpointer) poll_get_data->http_headers);
nm_g_slice_free(poll_get_data); nm_g_slice_free(poll_get_data);
} }
@ -546,9 +546,14 @@ nm_http_client_poll_get(NMHttpClient * self,
.check_fcn = check_fcn, .check_fcn = check_fcn,
.check_user_data = check_user_data, .check_user_data = check_user_data,
.response_code = -1, .response_code = -1,
.http_headers = NM_CAST_STRV_CC(g_strdupv((char **) http_headers)), .http_headers = NULL,
}; };
if (http_headers) {
poll_get_data->http_headers =
nm_utils_strv_dup_packed(http_headers, -1) ?: g_new(const char *, 1);
}
nmcs_wait_for_objects_register(poll_get_data->task); nmcs_wait_for_objects_register(poll_get_data->task);
g_task_set_task_data(poll_get_data->task, poll_get_data, _poll_get_data_free); g_task_set_task_data(poll_get_data->task, poll_get_data, _poll_get_data_free);