shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 10:25:06 +03:00
Code

journal-upload: use _cleanup_ for curl_slist

Browse Source
This commit is contained in:
David Tardon 2021-03-17 13:25:47 +01:00
parent 3851069709
commit c4a2d475f1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/journal-remote/journal-upload.c
View File

@ -72,6 +72,7 @@ static void close_fd_input(Uploader *u);
} while (0)
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(CURL*, curl_easy_cleanup, NULL);
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct curl_slist*, curl_slist_free_all, NULL);
static size_t output_callback(char *buf,
size_t size,
@ -182,27 +183,24 @@ int start_upload(Uploader *u,
assert(input_callback);
if (!u->header) {
struct curl_slist *h, *l;
_cleanup_(curl_slist_free_allp) struct curl_slist *h = NULL;
struct curl_slist *l;
h = curl_slist_append(NULL, "Content-Type: application/vnd.fdo.journal");
if (!h)
return log_oom();
l = curl_slist_append(h, "Transfer-Encoding: chunked");
if (!l) {
curl_slist_free_all(h);
if (!l)
return log_oom();
}
h = l;
l = curl_slist_append(h, "Accept: text/plain");
if (!l) {
curl_slist_free_all(h);
if (!l)
return log_oom();
}
h = l;
u->header = h;
u->header = TAKE_PTR(h);
}
if (!u->easy) {