From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 28 Nov 2023 20:59:36 +0000 (+0100)
Subject: lib-json: json-parser - Rename local variable in json_string_istream_read()
X-Git-Tag: 2.4.0~1877
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faf9bb08e04498257f3ccb3bd39c962b995d4a87;p=thirdparty%2Fdovecot%2Fcore.git

lib-json: json-parser - Rename local variable in json_string_istream_read()

Also restructure its use a bit to make its function more clear.
---

diff --git a/src/lib-json/json-parser.c b/src/lib-json/json-parser.c
index c8167c0124..bc19886c2a 100644
--- a/src/lib-json/json-parser.c
+++ b/src/lib-json/json-parser.c
@@ -2300,7 +2300,7 @@ static ssize_t json_string_istream_read(struct istream_private *stream)
 	struct json_string_istream *jstream =
 		(struct json_string_istream *)stream;
 	struct json_parser *parser = jstream->parser;
-	bool read_data;
+	bool stop_loop;
 	size_t old_pos;
 	int ret;
 
@@ -2329,7 +2329,7 @@ static ssize_t json_string_istream_read(struct istream_private *stream)
 		old_pos = str_len(parser->buffer);
 		ret = json_parser_continue(parser);
 		i_assert(str_len(parser->buffer) >= old_pos);
-		read_data = str_len(parser->buffer) > old_pos;
+		stop_loop = (str_len(parser->buffer) > old_pos);
 		switch (ret) {
 		case JSON_PARSE_INTERRUPTED:
 			i_assert(stream->skip == 0 ||
@@ -2338,11 +2338,11 @@ static ssize_t json_string_istream_read(struct istream_private *stream)
 			break;
 		case JSON_PARSE_BOUNDARY:
 			jstream->ended = TRUE;
-			read_data = TRUE;
 			if (str_len(parser->buffer) == old_pos) {
 				stream->istream.eof = TRUE;
 				return -1;
 			}
+			stop_loop = TRUE;
 			break;
 		case JSON_PARSE_NO_DATA:
 			stream->buffer = str_data(parser->buffer);
@@ -2361,7 +2361,7 @@ static ssize_t json_string_istream_read(struct istream_private *stream)
 		default:
 			i_unreached();
 		}
-	} while (jstream->buffer_overflowed && !read_data);
+	} while (jstream->buffer_overflowed && !stop_loop);
 
 	stream->pos = str_len(parser->buffer);
 	stream->buffer = str_data(parser->buffer);