From 99423234b8a328da83103b8593efb130e3273a39 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sat, 24 Jun 2017 12:20:16 +0200
Subject: [PATCH] mu: fix some compiler warnings

---
 lib/mu-maildir.c        |  1 +
 lib/mu-msg-sexp.c       | 14 +++++++++-----
 lib/mu-msg.c            | 30 +++++++++++++++++-------------
 lib/tests/test-mu-msg.c |  9 +++++----
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/lib/mu-maildir.c b/lib/mu-maildir.c
index e737a865..bf68111c 100644
--- a/lib/mu-maildir.c
+++ b/lib/mu-maildir.c
@@ -354,6 +354,7 @@ ignore_dir_entry (struct dirent *entry, unsigned char d_type)
 				/* looks like a backup / tempsave file */
 				if (entry->d_name[u + 1] == '\0')
 					return TRUE;
+				continue;
 			default:
 				continue;
 			}
diff --git a/lib/mu-msg-sexp.c b/lib/mu-msg-sexp.c
index aad62a92..53941a6d 100644
--- a/lib/mu-msg-sexp.c
+++ b/lib/mu-msg-sexp.c
@@ -429,19 +429,23 @@ append_sexp_thread_info (GString *gstr, const MuMsgIterThreadInfo *ti)
 }
 
 static void
-append_sexp_param (GString *gstr, GSList *param)
+append_sexp_param (GString *gstr, const GSList *param)
 {
 	for (;param; param = g_slist_next (param)) {
+		const char *str;
 		char *key, *value;
 
-		key = param->data;
-		key = key ? mu_str_escape_c_literal (key, FALSE) : "";
+		str   = param->data;
+		key   = str ? mu_str_escape_c_literal (str, FALSE) : g_strdup ("");
 
 		param = g_slist_next (param);
-		value = param->data;
-		value = value ? mu_str_escape_c_literal (value, FALSE) : "";
+		str   = param->data;
+		value = str ? mu_str_escape_c_literal (str, FALSE) : g_strdup ("");
 
 		g_string_append_printf (gstr, "(\"%s\" . \"%s\")", key, value);
+		g_free (key);
+		g_free (value);
+
 		if (param->next)
 			g_string_append_c (gstr, ' ');
 	}
diff --git a/lib/mu-msg.c b/lib/mu-msg.c
index 249c2019..8a9d03f3 100644
--- a/lib/mu-msg.c
+++ b/lib/mu-msg.c
@@ -521,23 +521,21 @@ get_body (MuMsg *self, MuMsgOptions opts, gboolean want_html)
 }
 
 
-struct _ContentTypeData {
-	const GMimeContentType *ctype;
-	gboolean want_html;
-};
-typedef struct _ContentTypeData ContentTypeData;
-
+typedef struct {
+	GMimeContentType	*ctype;
+	gboolean		 want_html;
+} ContentTypeData;
 
 static void
 find_content_type (MuMsg *msg, MuMsgPart *mpart, ContentTypeData *cdata)
 {
+	GMimePart *wanted;
+
 	if (!GMIME_IS_PART(mpart->data))
 		return;
 
 	/* text-like attachments are included when in text-mode */
 
-	GMimePart *wanted = NULL;
-
 	if (!cdata->want_html &&
 	    (mpart->part_type & MU_MSG_PART_TYPE_TEXT_PLAIN))
 		wanted = mpart->data;
@@ -545,8 +543,12 @@ find_content_type (MuMsg *msg, MuMsgPart *mpart, ContentTypeData *cdata)
 		 cdata->want_html &&
 		 (mpart->part_type & MU_MSG_PART_TYPE_TEXT_HTML))
 		wanted = mpart->data;
+	else
+		wanted = NULL;
+
 	if (wanted)
-		cdata->ctype = g_mime_object_get_content_type (wanted);
+		cdata->ctype = g_mime_object_get_content_type (
+			GMIME_OBJECT(wanted));
 }
 
 
@@ -554,19 +556,21 @@ static const GSList*
 get_content_type_parameters (MuMsg *self, MuMsgOptions opts, gboolean want_html)
 {
 	ContentTypeData cdata;
+
 	cdata.want_html = want_html;
-	cdata.ctype = NULL;
+	cdata.ctype	= NULL;
 
 	mu_msg_part_foreach (self, opts,
 			     (MuMsgPartForeachFunc)find_content_type,
 			     &cdata);
 
 	if (cdata.ctype) {
-		const GSList *paramlist;
-		const GMimeParam *param;
+
+		GSList			*paramlist;
+		const GMimeParam	*param;
 
 		paramlist = NULL;
-		param = g_mime_content_type_get_params (cdata.ctype);
+		param	  = g_mime_content_type_get_params (cdata.ctype);
 
 		for (; param; param = param->next) {
 			paramlist = g_slist_prepend (paramlist,
diff --git a/lib/tests/test-mu-msg.c b/lib/tests/test-mu-msg.c
index 37ea8af2..b27e9f2c 100644
--- a/lib/tests/test-mu-msg.c
+++ b/lib/tests/test-mu-msg.c
@@ -183,8 +183,8 @@ test_mu_msg_02 (void)
 static void
 test_mu_msg_03 (void)
 {
-	MuMsg *msg;
-	GSList *params;
+	MuMsg		*msg;
+	const GSList	*params;
 
 	msg = get_msg (MU_TESTMAILDIR4 "/1283599333.1840_11.cthulhu!2,");
 	g_assert_cmpstr (mu_msg_get_to(msg),
@@ -201,7 +201,8 @@ test_mu_msg_03 (void)
 			 ==,
 			 "\nLet's write some fünkÿ text\nusing umlauts.\n\nFoo.\n");
 
-	params = mu_msg_get_body_text_content_type_parameters(msg, MU_MSG_OPTION_NONE);
+	params = mu_msg_get_body_text_content_type_parameters(
+		msg, MU_MSG_OPTION_NONE);
 	g_assert_cmpuint (g_slist_length ((GSList*)params), ==, 2);
 
 	g_assert_cmpstr ((char*)params->data,==, "charset");
@@ -375,7 +376,7 @@ test_mu_msg_references_dups (void)
 
 	mlist = mu_msg_get_mailing_list (msg);
 	g_assert_cmpstr (mlist ,==, "Example of List Id");
-		
+
 	mu_msg_unref (msg);
 }