From c9290315ce840ed1001b897220f3f733811ffc66 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Fri, 7 Dec 2018 12:13:10 +0100

Subject: [PATCH] =?UTF-8?q?=C2=B5httpd:=20use=20a=20cleanup=20function=20t?=

 =?UTF-8?q?o=20call=20MHD=5Fdestroy=5Fresponse?=

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

(cherry-picked from commit d101fb24eb1c58c97f2adce1f69f4b61a788933a)

Related: #1664977

---

 src/journal-remote/journal-gatewayd.c | 53 +++++++--------------------

 src/journal-remote/microhttpd-util.c  | 11 ++----

 src/journal-remote/microhttpd-util.h  |  2 +

 3 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c

index 9e77e314ff..3a167ab890 100644

--- a/src/journal-remote/journal-gatewayd.c

+++ b/src/journal-remote/journal-gatewayd.c

@@ -451,7 +451,7 @@ static int request_handler_entries(

                 struct MHD_Connection *connection,

                 void *connection_cls) {

-        struct MHD_Response *response;

+        _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL;

         RequestMeta *m = connection_cls;

         int r;

@@ -493,11 +493,7 @@ static int request_handler_entries(

                 return respond_oom(connection);

         MHD_add_response_header(response, "Content-Type", mime_types[m->mode]);

-

-        r = MHD_queue_response(connection, MHD_HTTP_OK, response);

-        MHD_destroy_response(response);

-

-        return r;

+        return MHD_queue_response(connection, MHD_HTTP_OK, response);

 }

 static int output_field(FILE *f, OutputMode m, const char *d, size_t l) {

@@ -609,7 +605,7 @@ static int request_handler_fields(

                 const char *field,

                 void *connection_cls) {

-        struct MHD_Response *response;

+        _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL;

         RequestMeta *m = connection_cls;

         int r;

@@ -632,11 +628,7 @@ static int request_handler_fields(

                 return respond_oom(connection);

         MHD_add_response_header(response, "Content-Type", mime_types[m->mode == OUTPUT_JSON ? OUTPUT_JSON : OUTPUT_SHORT]);

-

-        r = MHD_queue_response(connection, MHD_HTTP_OK, response);

-        MHD_destroy_response(response);

-

-        return r;

+        return MHD_queue_response(connection, MHD_HTTP_OK, response);

 }

 static int request_handler_redirect(

@@ -644,8 +636,7 @@ static int request_handler_redirect(

                 const char *target) {

         char *page;

-        struct MHD_Response *response;

-        int ret;

+        _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL;

         assert(connection);

         assert(target);

@@ -661,11 +652,7 @@ static int request_handler_redirect(

         MHD_add_response_header(response, "Content-Type", "text/html");

         MHD_add_response_header(response, "Location", target);

-

-        ret = MHD_queue_response(connection, MHD_HTTP_MOVED_PERMANENTLY, response);

-        MHD_destroy_response(response);

-

-        return ret;

+        return MHD_queue_response(connection, MHD_HTTP_MOVED_PERMANENTLY, response);

 }

 static int request_handler_file(

@@ -673,8 +660,7 @@ static int request_handler_file(

                 const char *path,

                 const char *mime_type) {

-        struct MHD_Response *response;

-        int ret;

+        _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL;

         _cleanup_close_ int fd = -1;

         struct stat st;

@@ -692,15 +678,10 @@ static int request_handler_file(

         response = MHD_create_response_from_fd_at_offset64(st.st_size, fd, 0);

         if (!response)

                 return respond_oom(connection);

-

-        fd = -1;

+        TAKE_FD(fd);

         MHD_add_response_header(response, "Content-Type", mime_type);

-

-        ret = MHD_queue_response(connection, MHD_HTTP_OK, response);

-        MHD_destroy_response(response);

-

-        return ret;

+        return MHD_queue_response(connection, MHD_HTTP_OK, response);

 }

 static int get_virtualization(char **v) {

@@ -737,14 +718,13 @@ static int request_handler_machine(

                 struct MHD_Connection *connection,

                 void *connection_cls) {

-        struct MHD_Response *response;

+        _cleanup_(MHD_destroy_responsep) struct MHD_Response *response = NULL;

         RequestMeta *m = connection_cls;

         int r;

         _cleanup_free_ char* hostname = NULL, *os_name = NULL;

         uint64_t cutoff_from = 0, cutoff_to = 0, usage = 0;

-        char *json;

         sd_id128_t mid, bid;

-        _cleanup_free_ char *v = NULL;

+        _cleanup_free_ char *v = NULL, *json = NULL;

         assert(connection);

         assert(m);

@@ -793,21 +773,16 @@ static int request_handler_machine(

                      usage,

                      cutoff_from,

                      cutoff_to);

-

         if (r < 0)

                 return respond_oom(connection);

         response = MHD_create_response_from_buffer(strlen(json), json, MHD_RESPMEM_MUST_FREE);

-        if (!response) {

-                free(json);

+        if (!response)

                 return respond_oom(connection);

-        }

+        TAKE_PTR(json);

         MHD_add_response_header(response, "Content-Type", "application/json");

-        r = MHD_queue_response(connection, MHD_HTTP_OK, response);

-        MHD_destroy_response(response);

-

-        return r;

+        return MHD_queue_response(connection, MHD_HTTP_OK, response);

 }

 static int request_handler(

diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c

index 34dd9ea555..2ae5172fe9 100644

--- a/src/journal-remote/microhttpd-util.c

+++ b/src/journal-remote/microhttpd-util.c

@@ -32,21 +32,16 @@ static int mhd_respond_internal(struct MHD_Connection *connection,

                                 const char *buffer,

                                 size_t size,

                                 enum MHD_ResponseMemoryMode mode) {

-        struct MHD_Response *response;

-        int r;

-

         assert(connection);

-        response = MHD_create_response_from_buffer(size, (char*) buffer, mode);

+        _cleanup_(MHD_destroy_responsep) struct MHD_Response *response

+                = MHD_create_response_from_buffer(size, (char*) buffer, mode);

         if (!response)

                 return MHD_NO;

         log_debug("Queueing response %u: %s", code, buffer);

         MHD_add_response_header(response, "Content-Type", "text/plain");

-        r = MHD_queue_response(connection, code, response);

-        MHD_destroy_response(response);

-

-        return r;

+        return MHD_queue_response(connection, code, response);

 }

 int mhd_respond(struct MHD_Connection *connection,

diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h

index a50a2a75c7..26909082a1 100644

--- a/src/journal-remote/microhttpd-util.h

+++ b/src/journal-remote/microhttpd-util.h

@@ -73,3 +73,5 @@ int check_permissions(struct MHD_Connection *connection, int *code, char **hostn

  * interesting events without overwhelming detail.

  */

 int setup_gnutls_logger(char **categories);

+

+DEFINE_TRIVIAL_CLEANUP_FUNC(struct MHD_Response*,  MHD_destroy_response);