From 99a0a6a1994381a551b5908f3772054e38560ae0 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <pj@pehjota.net>
Date: Sat, 28 Oct 2017 23:36:14 -0400
Subject: MqWebView: Rewrite extension checking functions

Are these conditional blocks easier to read than the long return
statements?
---
(limited to 'src')

diff --git a/src/web-view.c b/src/web-view.c
index 31540b3..f7e410f 100644
--- a/src/web-view.c
+++ b/src/web-view.c
@@ -914,27 +914,31 @@ get_clean_title(MqWebView *web_view)
 static gboolean
 extension_is_html(const gchar *extension)
 {
-	return
-		extension[0] == 'h' &&
-		extension[1] == 't' &&
-		extension[2] == 'm' &&
-		(extension[3] == '\0' ||
-			(extension[3] == 'l' &&
-				extension[4] == '\0'));
+	if (extension[0] == 'h' && extension[1] == 't' && extension[2] == 'm') {
+		if (extension[3] == '\0') {
+			return TRUE;
+		} else if (extension[3] == 'l' && extension[4] == '\0') {
+			return TRUE;
+		}
+	}
+	return FALSE;
 }
 
 static gboolean
 extension_is_mhtml(const gchar *extension)
 {
-	return
-		extension[0] == 'm' &&
-		extension[1] == 'h' &&
-		extension[2] == 't' &&
-		(extension[3] == '\0' ||
-			(extension[3] == 'm' &&
-				(extension[4] == '\0' ||
-					(extension[4] == 'l' &&
-						extension[5] == '\0'))));
+	if (extension[0] == 'm' && extension[1] == 'h' && extension[2] == 't') {
+		if (extension[3] == '\0') {
+			return TRUE;
+		} else if (extension[3] == 'm') {
+			if (extension[3] == '\0') {
+				return TRUE;
+			} else if (extension[4] == 'l' && extension[5] == '\0'){
+				return TRUE;
+			}
+		}
+	}
+	return FALSE;
 }
 
 static void
--
cgit v0.9.1