From 12f02ea08f91d019f1824ae9303708e70863dd3e Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sat, 30 Oct 2010 15:14:14 +0300
Subject: [PATCH] * mu-cmd-extract,test-mu-util: cleanups to pass line33/cc10

---
 src/mu-cmd-extract.c     | 23 ++++++++++++++++-------
 src/tests/test-mu-util.c | 21 +++++++--------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/mu-cmd-extract.c b/src/mu-cmd-extract.c
index fa160ca5..0a53261c 100644
--- a/src/mu-cmd-extract.c
+++ b/src/mu-cmd-extract.c
@@ -191,14 +191,9 @@ show_parts (const char* path, MuConfigOptions *opts)
 	
 }
 
-gboolean
-mu_cmd_extract (MuConfigOptions *opts)
+static gboolean
+check_params (MuConfigOptions *opts)
 {
-	gboolean rv;
-	
-	g_return_val_if_fail (opts, FALSE);
-	g_return_val_if_fail (mu_cmd_equals (opts, "extract"), FALSE);
-	
 	if (!opts->params[1]) {
 		g_warning ("missing mail file to extract something from");
 		return FALSE;
@@ -220,6 +215,20 @@ mu_cmd_extract (MuConfigOptions *opts)
 		return FALSE;
 	}
 
+	return TRUE;
+}
+
+gboolean
+mu_cmd_extract (MuConfigOptions *opts)
+{
+	gboolean rv;
+	
+	g_return_val_if_fail (opts, FALSE);
+	g_return_val_if_fail (mu_cmd_equals (opts, "extract"), FALSE);
+
+	if (!check_params (opts))
+		return FALSE;
+	
 	if (!opts->parts &&
 	    !opts->save_attachments &&
 	    !opts->save_all)  /* show, don't save */
diff --git a/src/tests/test-mu-util.c b/src/tests/test-mu-util.c
index 3fc1db08..882e42ae 100644
--- a/src/tests/test-mu-util.c
+++ b/src/tests/test-mu-util.c
@@ -203,12 +203,9 @@ main (int argc, char *argv[])
 	g_test_init (&argc, &argv, NULL);
 
 	/* mu_util_dir_expand */
-	g_test_add_func ("/mu-util/mu-util-dir-expand-01",
-			 test_mu_util_dir_expand_01);
-	g_test_add_func ("/mu-util/mu-util-dir-expand-02",
-			 test_mu_util_dir_expand_02);
-	g_test_add_func ("/mu-util/mu-util-dir-expand-03",
-			 test_mu_util_dir_expand_03);
+	g_test_add_func ("/mu-util/mu-util-dir-expand-01", test_mu_util_dir_expand_01);
+	g_test_add_func ("/mu-util/mu-util-dir-expand-02", test_mu_util_dir_expand_02);
+	g_test_add_func ("/mu-util/mu-util-dir-expand-03", test_mu_util_dir_expand_03);
 	
 	/* mu_util_guess_maildir */
 	g_test_add_func ("/mu-util/mu-util-guess-maildir-01",
@@ -217,14 +214,10 @@ main (int argc, char *argv[])
 			 test_mu_util_guess_maildir_02);
 
 	/* mu_util_check_dir */
-	g_test_add_func ("/mu-util/mu-util-check-dir-01",
-			 test_mu_util_check_dir_01);
-	g_test_add_func ("/mu-util/mu-util-check-dir-02",
-			 test_mu_util_check_dir_02);
-	g_test_add_func ("/mu-util/mu-util-check-dir-03",
-			 test_mu_util_check_dir_03);
-	g_test_add_func ("/mu-util/mu-util-check-dir-04",
-			 test_mu_util_check_dir_04);
+	g_test_add_func ("/mu-util/mu-util-check-dir-01", test_mu_util_check_dir_01);
+	g_test_add_func ("/mu-util/mu-util-check-dir-02", test_mu_util_check_dir_02);
+	g_test_add_func ("/mu-util/mu-util-check-dir-03", test_mu_util_check_dir_03);
+	g_test_add_func ("/mu-util/mu-util-check-dir-04", test_mu_util_check_dir_04);
 
 	/* test_mu_util_str_from_strv */
 	g_test_add_func ("/mu-util/mu-util-str-from-strv-01",