From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 29 Nov 2022 19:08:03 +0000 (+0200)
Subject: lib-settings: Remove unused settings_parse_stream*()
X-Git-Tag: 2.4.0~3060
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d09f9a18c238e5d9fb5de826f3fdbf90f0b7c48;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: Remove unused settings_parse_stream*()
---

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index 523bea1cff..04b609304f 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -4,7 +4,6 @@
 #include "array.h"
 #include "hash.h"
 #include "net.h"
-#include "istream.h"
 #include "env-util.h"
 #include "execv-const.h"
 #include "str.h"
@@ -819,101 +818,6 @@ settings_parse_get_prev_info(struct setting_parser_context *ctx)
 	return ctx->prev_info;
 }
 
-static const char *settings_translate_lf(const char *value)
-{
-	char *dest, *p;
-
-	if (strchr(value, SETTING_STREAM_LF_CHAR[0]) == NULL)
-		return value;
-
-	dest = t_strdup_noconst(value);
-	for (p = dest; *p != '\0'; p++) {
-		if (*p == SETTING_STREAM_LF_CHAR[0])
-			*p = '\n';
-	}
-	return dest;
-}
-
-int settings_parse_stream(struct setting_parser_context *ctx,
-			  struct istream *input)
-{
-	bool ignore_unknown_keys =
-		(ctx->flags & SETTINGS_PARSER_FLAG_IGNORE_UNKNOWN_KEYS) != 0;
-	const char *line;
-	int ret;
-
-	while ((line = i_stream_next_line(input)) != NULL) {
-		if (*line == '\0') {
-			/* empty line finishes it */
-			return 0;
-		}
-		ctx->linenum++;
-		if (ctx->linenum == 1 && str_begins(line, "ERROR ", &line)) {
-			ctx->error = p_strdup(ctx->parser_pool, line);
-			return -1;
-		}
-
-		T_BEGIN {
-			line = settings_translate_lf(line);
-			ret = settings_parse_line(ctx, line);
-		} T_END;
-
-		if (ret < 0 || (ret == 0 && !ignore_unknown_keys)) {
-			ctx->error = p_strdup_printf(ctx->parser_pool,
-				"Line %u: %s", ctx->linenum, ctx->error);
-			return -1;
-		}
-	}
-	return 1;
-}
-
-int settings_parse_stream_read(struct setting_parser_context *ctx,
-			       struct istream *input)
-{
-	int ret;
-
-	do {
-		if ((ret = settings_parse_stream(ctx, input)) < 0)
-			return -1;
-		if (ret == 0) {
-			/* empty line read */
-			return 0;
-		}
-	} while ((ret = i_stream_read(input)) > 0);
-
-	switch (ret) {
-	case -1:
-		if (ctx->error != NULL)
-			break;
-		if (input->stream_errno != 0) {
-			ctx->error = p_strdup_printf(ctx->parser_pool,
-				"read(%s) failed: %s", i_stream_get_name(input),
-				i_stream_get_error(input));
-		} else if (input->v_offset == 0) {
-			ctx->error = p_strdup_printf(ctx->parser_pool,
-				"read(%s) disconnected before receiving any data",
-				i_stream_get_name(input));
-		} else {
-			ctx->error = p_strdup_printf(ctx->parser_pool,
-				"read(%s) disconnected before receiving "
-				"end-of-settings line",
-				i_stream_get_name(input));
-		}
-		break;
-	case -2:
-		ctx->error = p_strdup_printf(ctx->parser_pool,
-					     "Line %u: line too long",
-					     ctx->linenum);
-		break;
-	case 0:
-		/* blocks */
-		return 1;
-	default:
-		i_unreached();
-	}
-	return -1;
-}
-
 bool settings_check(const struct setting_parser_info *info, pool_t pool,
 		    void *set, const char **error_r)
 {
diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h
index 7257982646..7e5bf20ed0 100644
--- a/src/lib-settings/settings-parser.h
+++ b/src/lib-settings/settings-parser.h
@@ -177,13 +177,6 @@ int settings_parse_line(struct setting_parser_context *ctx, const char *line);
 /* Parse key/value pair. Returns 1 if OK, 0 if key is unknown, -1 if error. */
 int settings_parse_keyvalue(struct setting_parser_context *ctx,
 			    const char *key, const char *value);
-/* Parse data already read in input stream. */
-int settings_parse_stream(struct setting_parser_context *ctx,
-			  struct istream *input);
-/* Read data from input stream and parser it. returns -1 = error,
-   0 = done, 1 = not finished yet (stream is non-blocking) */
-int settings_parse_stream_read(struct setting_parser_context *ctx,
-         		       struct istream *input);
 /* Call all check_func()s to see if currently parsed settings are valid. */
 bool settings_parser_check(struct setting_parser_context *ctx, pool_t pool,
 			   const char **error_r);