From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 16 Sep 2020 01:05:30 +0000 (+0200)
Subject: lib-mail: message-header-encode - Use size_t for length/size variables and parameters.
X-Git-Tag: 2.3.13~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=894e088f92d8c371d917f75dd4eca40b915c7c0e;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: message-header-encode - Use size_t for length/size variables and parameters.
---

diff --git a/src/lib-mail/message-header-encode.c b/src/lib-mail/message-header-encode.c
index 1958d2abd0..ff5b96d8e9 100644
--- a/src/lib-mail/message-header-encode.c
+++ b/src/lib-mail/message-header-encode.c
@@ -11,8 +11,8 @@
 #define IS_LWSP(c) \
 	((c) == ' ' || (c) == '\t' || (c) == '\n')
 
-static bool input_idx_need_encoding(const unsigned char *input,
-				    unsigned int i, unsigned int len)
+static bool
+input_idx_need_encoding(const unsigned char *input, size_t i, size_t len)
 {
 	switch (input[i]) {
 	case '\r':
@@ -56,10 +56,10 @@ static bool input_idx_need_encoding(const unsigned char *input,
 	return FALSE;
 }
 
-void message_header_encode_q(const unsigned char *input, unsigned int len,
-			     string_t *output, unsigned int first_line_len)
+void message_header_encode_q(const unsigned char *input, size_t len,
+			     string_t *output, size_t first_line_len)
 {
-	unsigned int i, line_len_left;
+	size_t i, line_len_left;
 
 	line_len_left = MIME_MAX_LINE_LEN - MIME_WRAPPER_LEN;
 
@@ -107,10 +107,10 @@ void message_header_encode_q(const unsigned char *input, unsigned int len,
 	str_append(output, "?=");
 }
 
-void message_header_encode_b(const unsigned char *input, unsigned int len,
-			     string_t *output, unsigned int first_line_len)
+void message_header_encode_b(const unsigned char *input, size_t len,
+			     string_t *output, size_t first_line_len)
 {
-	unsigned int line_len, line_len_left, max;
+	size_t line_len, line_len_left, max;
 
 	line_len = first_line_len;
 	if (line_len >= MIME_MAX_LINE_LEN - MIME_WRAPPER_LEN) {
@@ -156,13 +156,13 @@ void message_header_encode(const char *input, string_t *output)
 	message_header_encode_data((const void *)input, strlen(input), output);
 }
 
-void message_header_encode_data(const unsigned char *input, unsigned int len,
+void message_header_encode_data(const unsigned char *input, size_t len,
 				string_t *output)
 {
-	unsigned int i, j, first_line_len, cur_line_len, last_idx;
-	unsigned int enc_chars, enc_len, base64_len, q_len;
+	size_t i, j, first_line_len, cur_line_len, last_idx;
+	size_t enc_chars, enc_len, base64_len, q_len;
 	const unsigned char *next_line_input;
-	unsigned int next_line_len = 0;
+	size_t next_line_len = 0;
 	bool use_q, cr;
 
 	/* find the first word that needs encoding */
diff --git a/src/lib-mail/message-header-encode.h b/src/lib-mail/message-header-encode.h
index ae5aa5b1bd..1cc9e5f0fa 100644
--- a/src/lib-mail/message-header-encode.h
+++ b/src/lib-mail/message-header-encode.h
@@ -6,16 +6,16 @@
    whitespace is preserved. Bare [CR]LF will be preserved by adding a TAB
    after it to make it a valid folding whitespace. */
 void message_header_encode(const char *input, string_t *output);
-void message_header_encode_data(const unsigned char *input, unsigned int len,
+void message_header_encode_data(const unsigned char *input, size_t len,
 				string_t *output);
 
 /* Encode the whole UTF-8 input using "Q" or "B" encoding into output.
    The output is split into multiple lines if necessary (max 76 chars/line).
    The first line's length is given as parameter. All the control characters
    are encoded, including NUL, CR and LF. */
-void message_header_encode_q(const unsigned char *input, unsigned int len,
-			     string_t *output, unsigned int first_line_len);
-void message_header_encode_b(const unsigned char *input, unsigned int len,
-			     string_t *output, unsigned int first_line_len);
+void message_header_encode_q(const unsigned char *input, size_t len,
+			     string_t *output, size_t first_line_len);
+void message_header_encode_b(const unsigned char *input, size_t len,
+			     string_t *output, size_t first_line_len);
 
 #endif