Mercurial > dovecot > core-2.2

changeset 19945:e8f9cf430e53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib: Small code cleanup to istream-concat - don't use a magic UINT_MAX value as error code
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Mon, 21 Mar 2016 21:46:47 +0900
parents 96a4451f07e7
children 7ffdbac8e3ae
files src/lib/istream-concat.c
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/istream-concat.c	Fri Mar 11 17:44:41 2016 +1300
+++ b/src/lib/istream-concat.c	Mon Mar 21 21:46:47 2016 +0900
@@ -221,8 +221,9 @@
 	return ret;
 }
 
-static unsigned int
-find_v_offset(struct concat_istream *cstream, uoff_t *v_offset)
+static int
+find_v_offset(struct concat_istream *cstream, uoff_t *v_offset,
+	      unsigned int *idx_r)
 {
 	const struct stat *st;
 	unsigned int i;
@@ -244,7 +245,7 @@
 					i_stream_get_error(cstream->input[i]));
 				cstream->istream.istream.stream_errno =
 					cstream->input[i]->stream_errno;
-				return UINT_MAX;
+				return -1;
 			}
 
 			/* @UNSAFE */
@@ -256,7 +257,8 @@
 		*v_offset -= cstream->input_size[i];
 	}
 
-	return i;
+	*idx_r = i;
+	return 0;
 }
 
 static void i_stream_concat_seek(struct istream_private *stream,
@@ -270,8 +272,7 @@
 	cstream->prev_stream_skip = 0;
 	cstream->prev_skip = 0;
 
-	cstream->cur_idx = find_v_offset(cstream, &v_offset);
-	if (cstream->cur_idx == UINT_MAX) {
+	if (find_v_offset(cstream, &v_offset, &cstream->cur_idx) < 0) {
 		/* failed */
 		cstream->cur_input = NULL;
 		stream->istream.stream_errno = EINVAL;
@@ -287,10 +288,10 @@
 {
 	struct concat_istream *cstream = (struct concat_istream *)stream;
 	uoff_t v_offset = (uoff_t)-1;
-	unsigned int i;
+	unsigned int i, cur_idx;
 
 	/* make sure we have all sizes */
-	if (find_v_offset(cstream, &v_offset) == UINT_MAX)
+	if (find_v_offset(cstream, &v_offset, &cur_idx) < 0)
 		return -1;
 
 	stream->statbuf.st_size = 0;