From dd59c7a1f0ebb254b0daac79fc3d0379793b2198 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 28 Feb 2016 21:03:47 +0200 Subject: [PATCH] lib-mail: Minor code cleanup to message_parser_deinit() calls. --- src/lib-mail/istream-attachment-extractor.c | 5 ++--- src/lib-mail/istream-binary-converter.c | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib-mail/istream-attachment-extractor.c b/src/lib-mail/istream-attachment-extractor.c index fd436fa874..bc62146d24 100644 --- a/src/lib-mail/istream-attachment-extractor.c +++ b/src/lib-mail/istream-attachment-extractor.c @@ -679,11 +679,10 @@ static void i_stream_attachment_extractor_close(struct iostream_private *stream, struct attachment_istream *astream = (struct attachment_istream *)stream; struct message_part *parts; - int ret; if (astream->parser != NULL) { - ret = message_parser_deinit(&astream->parser, &parts); - i_assert(ret == 0); /* we didn't use preparsed message_parts */ + if (message_parser_deinit(&astream->parser, &parts) < 0) + i_unreached(); /* we didn't use preparsed message_parts */ } hash_format_deinit_free(&astream->set.hash_format); if (astream->pool != NULL) diff --git a/src/lib-mail/istream-binary-converter.c b/src/lib-mail/istream-binary-converter.c index ccc2990e2e..87f2f419a1 100644 --- a/src/lib-mail/istream-binary-converter.c +++ b/src/lib-mail/istream-binary-converter.c @@ -274,8 +274,10 @@ static void i_stream_binary_converter_close(struct iostream_private *stream, (struct binary_converter_istream *)stream; struct message_part *parts; - if (bstream->parser != NULL) - (void)message_parser_deinit(&bstream->parser, &parts); + if (bstream->parser != NULL) { + if (message_parser_deinit(&bstream->parser, &parts) < 0) + i_unreached(); /* we didn't use preparsed message_parts */ + } if (bstream->pool != NULL) pool_unref(&bstream->pool); if (close_parent)