Fix/mute issues found by Coverity scan

This makes the code free of Coverity scan issues.
It is sometimes quite pedantic and expects/suggests some
coding habits, thus certain changes may look weird, but for a good
thing, I hope. The code is also tagged with Coverity scan
suppressions, to keep the code as is and hide the warning too.
Also note that Coverity treats g_return_if_fail(), g_assert() and
similar macros as unreliable, and it's true these can be disabled
during the compile time, thus it brings in other set of 'weird'
changes.

1 files changed, 3 insertions, 3 deletions

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 62405fdb5b..1b608906be 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -468,9 +468,10 @@ composer_presend_check_unwanted_html (EMsgComposer *composer,
 		gboolean html_problem = FALSE;
 
 		for (ii = 0; recipients[ii] != NULL; ii++) {
-			if (!e_destination_get_html_mail_pref (recipients[ii]))
+			if (!e_destination_get_html_mail_pref (recipients[ii])) {
 				html_problem = TRUE;
 				break;
+			}
 		}
 
 		if (html_problem) {
@@ -2882,14 +2883,13 @@ em_utils_construct_composer_text (CamelSession *session,
                                   EMailPartList *parts_list)
 {
 	gchar *text, *credits;
-	gboolean start_bottom = 0;
 
 	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
 
 	credits = attribution_format (message);
 	text = em_utils_message_to_html (
 		session, message, credits, E_MAIL_FORMATTER_QUOTE_FLAG_CITE,
-		parts_list, start_bottom ? "<BR>" : NULL, NULL);
+		parts_list, NULL, NULL);
 	g_free (credits);
 
 	return text;