From 2d1356e8dbfbf0361233b38e4fac030b86c4e03e Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 31 May 2011 16:18:45 -0700 Subject: [PATCH] Reduce some excessive indentation. I prefer checking a condition and returning early rather than making large blocks of code within a function conditional. --- notmuch-show.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 1ed49d99..b9a41cc6 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -393,22 +393,23 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out) INTERNAL_ERROR ("Illegal request to format non-text part (%s) as text.", g_mime_content_type_to_string (content_type)); - charset = g_mime_object_get_content_type_parameter (part, "charset"); + if (stream_out == NULL) + return; - if (stream_out) { - stream_filter = g_mime_stream_filter_new (stream_out); - g_mime_stream_filter_add(GMIME_STREAM_FILTER (stream_filter), - g_mime_filter_crlf_new (FALSE, FALSE)); - if (charset) { - GMimeFilter *charset_filter; - charset_filter = g_mime_filter_charset_new (charset, "UTF-8"); - /* This result can be NULL for things like "unknown-8bit". - * Don't set a NULL filter as that makes GMime print - * annoying assertion-failure messages on stderr. */ - if (charset_filter) - g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), - charset_filter); - } + stream_filter = g_mime_stream_filter_new (stream_out); + g_mime_stream_filter_add(GMIME_STREAM_FILTER (stream_filter), + g_mime_filter_crlf_new (FALSE, FALSE)); + + charset = g_mime_object_get_content_type_parameter (part, "charset"); + if (charset) { + GMimeFilter *charset_filter; + charset_filter = g_mime_filter_charset_new (charset, "UTF-8"); + /* This result can be NULL for things like "unknown-8bit". + * Don't set a NULL filter as that makes GMime print + * annoying assertion-failure messages on stderr. */ + if (charset_filter) + g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter), + charset_filter); } wrapper = g_mime_part_get_content_object (GMIME_PART (part));