diff options
| author | Phil Pennock <pdp@exim.org> | 2011-09-05 16:08:19 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2011-09-05 16:08:19 -0400 |
| commit | eb02738d2e3fe3fc140781d90f776a4e7bf04c08 (patch) | |
| tree | 1a6df3fb342fb23651c8e1b20f7fc201430d1450 /src | |
| parent | d854d3a946bd9d03bee67b66109ae70fb4281a0e (diff) | |
ssize_t for mime.c
mime_decode_*() functions can return -1 for error, which would be lost when assigning to unsigned int.
Sprinkled ssize_t across function return types and result variables.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/mime.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/src/mime.c b/src/src/mime.c index bc2d2f08a..7c6d23df9 100644 --- a/src/src/mime.c +++ b/src/src/mime.c @@ -73,9 +73,10 @@ uschar *mime_decode_qp_char(uschar *qp_p, int *c) { /* just dump MIME part without any decoding */ -static int mime_decode_asis(FILE* in, FILE* out, uschar* boundary) +static ssize_t +mime_decode_asis(FILE* in, FILE* out, uschar* boundary) { - int len, size = 0; + ssize_t len, size = 0; uschar buffer[MIME_MAX_LINE_LENGTH]; while(fgets(CS buffer, MIME_MAX_LINE_LENGTH, mime_stream) != NULL) { @@ -95,11 +96,12 @@ static int mime_decode_asis(FILE* in, FILE* out, uschar* boundary) /* decode base64 MIME part */ -static int mime_decode_base64(FILE* in, FILE* out, uschar* boundary) +static ssize_t +mime_decode_base64(FILE* in, FILE* out, uschar* boundary) { uschar ibuf[MIME_MAX_LINE_LENGTH], obuf[MIME_MAX_LINE_LENGTH]; uschar *ipos, *opos; - size_t len, size = 0; + ssize_t len, size = 0; int bytestate = 0; opos = obuf; @@ -169,11 +171,12 @@ static int mime_decode_base64(FILE* in, FILE* out, uschar* boundary) /* decode quoted-printable MIME part */ -static int mime_decode_qp(FILE* in, FILE* out, uschar* boundary) +static ssize_t +mime_decode_qp(FILE* in, FILE* out, uschar* boundary) { uschar ibuf[MIME_MAX_LINE_LENGTH], obuf[MIME_MAX_LINE_LENGTH]; uschar *ipos, *opos; - size_t len, size = 0; + ssize_t len, size = 0; while (fgets(CS ibuf, MIME_MAX_LINE_LENGTH, in) != NULL) { @@ -271,8 +274,8 @@ int mime_decode(uschar **listptr) { uschar decode_path[1024]; FILE *decode_file = NULL; long f_pos = 0; - unsigned int size_counter = 0; - int (*decode_function)(FILE*, FILE*, uschar*); + ssize_t size_counter = 0; + ssize_t (*decode_function)(FILE*, FILE*, uschar*); if (mime_stream == NULL) return FAIL; |