From: Samuel BF <36996277+Samuel-BF@users.noreply.github.com>
Date: Sun, 27 Sep 2020 20:01:44 +0000 (+0200)
Subject: Removing unused n_fields in journal-gatewayd
X-Git-Tag: v247-rc1~165
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d99d1aaa21e216b2c2f520b58f847248407ba768;p=thirdparty%2Fsystemd.git

Removing unused n_fields in journal-gatewayd
---

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 48106d1bdbb..c4d45020803 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -58,9 +58,6 @@ typedef struct RequestMeta {
 
         bool follow;
         bool discrete;
-
-        uint64_t n_fields;
-        bool n_fields_set;
 } RequestMeta;
 
 static const char* const mime_types[_OUTPUT_MODE_MAX] = {
@@ -554,10 +551,6 @@ static ssize_t request_reader_fields(
                 /* End of this field, so let's serialize the next
                  * one */
 
-                if (m->n_fields_set &&
-                    m->n_fields <= 0)
-                        return MHD_CONTENT_READER_END_OF_STREAM;
-
                 r = sd_journal_enumerate_unique(m->journal, &d, &l);
                 if (r < 0) {
                         log_error_errno(r, "Failed to advance field index: %m");
@@ -568,9 +561,6 @@ static ssize_t request_reader_fields(
                 pos -= m->size;
                 m->delta += m->size;
 
-                if (m->n_fields_set)
-                        m->n_fields -= 1;
-
                 r = request_meta_ensure_tmp(m);
                 if (r < 0) {
                         log_error_errno(r, "Failed to create temporary file: %m");