Reduce some excessive indentation.

I prefer checking a condition and returning early rather than making
large blocks of code within a function conditional.

diff --git a/notmuch-show.c b/notmuch-show.c
index 1ed49d995efad1fac8dd1c5e9b37532f18734b32..b9a41cc653e4bab6f277e85d7d9d173a33711b7f 100644 (file)
--- 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));