* some small fixes for passing 'make cc10' and 'make line35'

src/mu-cmd-find.c

@@ -53,8 +53,7 @@ static gboolean output_sexp (MuMsgIter *iter, gboolean threads,
 static gboolean output_xml (MuMsgIter *iter,gboolean include_unreadable,
 			    GError **err);
 static gboolean output_plain (MuMsgIter *iter, const char *fields,
-			      gboolean summary, int summary_len,
-			      gboolean threads,
+			      int summary_len, gboolean threads,
 			      gboolean color,  gboolean include_unreadable,
 			      GError **err);
 
@@ -101,7 +100,7 @@ output_query_results (MuMsgIter *iter, MuConfig *opts, GError **err)
 		return output_links (iter, opts->linksdir, opts->clearlinks, err);
 	case MU_CONFIG_FORMAT_PLAIN:
 		return output_plain (iter, opts->fields,
-				     opts->summary, opts->summary_len,
+				     opts->summary ? opts->summary_len : 0,
 				     opts->threads, !opts->nocolor,
 				     opts->include_unreadable, err);
 	case MU_CONFIG_FORMAT_XML:
@@ -649,9 +648,8 @@ output_plain_fields (MuMsg *msg, const char *fields,
 }
 
 static gboolean
-output_plain (MuMsgIter *iter, const char *fields, gboolean summary, int summary_len,
-	      gboolean threads, gboolean color, gboolean include_unreadable,
-	      GError **err)
+output_plain (MuMsgIter *iter, const char *fields, int summary_len,
+	      gboolean threads, gboolean color, gboolean include_unreadable,  GError **err)
 {
 	MuMsgIter *myiter;
 	size_t count;
@@ -659,12 +657,6 @@ output_plain (MuMsgIter *iter, const char *fields, gboolean summary, int summary
 	g_return_val_if_fail (iter, FALSE);
 	g_return_val_if_fail (fields, FALSE);
 
-	if (summary && summary_len < 1) {
-		mu_util_g_set_error (err, MU_ERROR_IN_PARAMETERS,
-				     "summary must be >= 1");
-		return FALSE;
-	}
-
 	for (myiter = iter, count = 0; !mu_msg_iter_is_done (myiter);
 	     mu_msg_iter_next (myiter)) {
 
@@ -686,7 +678,7 @@ output_plain (MuMsgIter *iter, const char *fields, gboolean summary, int summary
 
 		output_plain_fields (msg, fields, color, threads);
 
-		if (summary)
+		if (summary_len > 0)
 			print_summary (msg, summary_len);
 
 		++count;

src/mu-cmd-server.c

@@ -865,7 +865,6 @@ move_msgid_maybe (MuStore *store, MuQuery *query, GSList *args, GError **err)
 {
 	const char *maildir, *msgid, *flagstr;
 	GSList *docids, *cur;
-	MuFlags flags;
 
 	maildir	= get_string_from_args (args, "maildir", TRUE, err);
 	msgid	= get_string_from_args (args, "msgid", TRUE, err);
@@ -875,25 +874,26 @@ move_msgid_maybe (MuStore *store, MuQuery *query, GSList *args, GError **err)
 	if (!msgid || !flagstr || maildir )
 		return FALSE;
 
-	docids = get_docids_from_msgids (query, msgid, err);
-	if (!docids) {
+	if (!(docids = get_docids_from_msgids (query, msgid, err))) {
 		print_and_clear_g_error (err);
 		return TRUE;
 	}
 
 	for (cur = docids; cur; cur = g_slist_next(cur)) {
 		MuMsg *msg;
+		MuFlags flags;
 		unsigned docid = (GPOINTER_TO_SIZE(cur->data));
 		if (!(msg = mu_store_get_msg (store, docid, err))) {
 			print_and_clear_g_error (err);
 			break;
 		}
-		if (flagstr)
-			flags = get_flags (mu_msg_get_path(msg), flagstr);
-		else
-			flags = mu_msg_get_flags (msg);
+
+		flags = flagstr ? get_flags (mu_msg_get_path(msg), flagstr) :
+			mu_msg_get_flags (msg);
+
 		if (flags == MU_FLAG_INVALID) {
 			print_error (MU_ERROR_IN_PARAMETERS, "invalid flags");
+			mu_msg_unref (msg);
 			break;
 		}
 

src/mu-str.c

@@ -459,9 +459,7 @@ mu_str_xapian_escape_in_place (char *term, gboolean esc_space)
 			break;
 		default:
 			/* escape all other special stuff */
-			if (*cur < '0' || (*cur > '9' && *cur < 'A')
-			    || (*cur > 'Z' && *cur < 'a') ||
-			    (*cur > 'z' && *cur < 0x80))
+			if (*cur < 0x80 && !isalnum (*cur))
 				*cur = escchar;
 		}
 	}