Minor fixes to get rid of the spurious gcc warnings

6 files changed, 27 insertions, 27 deletions

diff --git a/mh/mh_alias.l b/mh/mh_alias.l
index a11f51fc2..b94f72780 100644
--- a/mh/mh_alias.l
+++ b/mh/mh_alias.l
@@ -255,7 +255,7 @@ push_source (const char *name, int fail)
       free (filename);
       return 1;
     }
-  if (ctx = ctx_lookup (st.st_ino))
+  if ((ctx = ctx_lookup (st.st_ino)))
     {
       ali_parse_error (_("recursive inclusion"));
       if (ctx->prev)
diff --git a/mh/mh_alias.y b/mh/mh_alias.y
index 00ce4a526..f4e42c52e 100644
--- a/mh/mh_alias.y
+++ b/mh/mh_alias.y
@@ -359,7 +359,6 @@ mh_alias_get_address (char *name, mu_address_t *paddr, int *incl)
 {
   mu_iterator_t itr;
   mu_list_t list;
-  const char *domain = NULL;
 
   if (incl)
     *incl = 0;
diff --git a/mh/mh_init.c b/mh/mh_init.c
index cf6ace406..994ae6fc6 100644
--- a/mh/mh_init.c
+++ b/mh/mh_init.c
@@ -564,7 +564,7 @@ mh_spawnp (const char *prog, const char *file)
   xargv[i++] = (char*) file;
   xargv[i++] = NULL;
 
-  rc = mu_spawnvp (xargv[0], (const char**) xargv, &status);
+  rc = mu_spawnvp (xargv[0], xargv, &status);
 
   free (xargv);
   mu_argcv_free (argc, argv);
diff --git a/mh/mh_whatnow.c b/mh/mh_whatnow.c
index ff6875cea..09746c297 100644
--- a/mh/mh_whatnow.c
+++ b/mh/mh_whatnow.c
@@ -265,7 +265,7 @@ invoke (char *compname, char *defval, int argc, char **argv,
   if (extra1)
     xargv[i++] = extra1;
   xargv[i++] = NULL;
-  rc = mu_spawnvp (xargv[0], (const char **) xargv, &status);
+  rc = mu_spawnvp (xargv[0], xargv, &status);
   free (xargv);
   return rc ? rc : check_exit_status (progname, status);
 }
diff --git a/mh/mh_whom.c b/mh/mh_whom.c
index b005e6167..131b64941 100644
--- a/mh/mh_whom.c
+++ b/mh/mh_whom.c
@@ -105,7 +105,7 @@ mh_alias_expand (char *str, mu_address_t *paddr, int *incl)
     {
       int status;
       mu_argcv_string (argc, argv, &buf);
-      if (status = mu_address_create (paddr, buf))
+      if ((status = mu_address_create (paddr, buf)))
 	mu_error (_("Bad address `%s': %s"), buf, mu_strerror (status));
       free (buf);
     }
diff --git a/mh/mhn.c b/mh/mhn.c
index 0732ce64b..1ea66bed5 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -1623,30 +1623,31 @@ store_handler (mu_message_t msg, msg_part_t part, char *type, char *encoding,
 	    }
 
 	  if (!name
-	      && mu_header_aget_value (hdr, MU_HEADER_CONTENT_TYPE, &val) == 0) {
-	    if (mu_argcv_get (val, "=", NULL, &argc, &argv) == 0)
-	      {
-		int i;
-
-		for (i = 0; i < argc; i++)
-		  {
-		    if ((strcmp (argv[i], "filename") == 0
-			 || strcmp (argv[i], "name") == 0)
-			&& ++i < argc
-			&& argv[i][0] == '='
-			&& ++i < argc)
-		      {
-			name = normalize_path (dir, argv[i]);
-			break;
-		      }
-		  }
-		mu_argcv_free (argc, argv);
-	      }
-	    free (val);
-	  }
+	      && mu_header_aget_value (hdr, MU_HEADER_CONTENT_TYPE, &val) == 0)
+	    {
+	      if (mu_argcv_get (val, "=", NULL, &argc, &argv) == 0)
+		{
+		  int i;
+		  
+		  for (i = 0; i < argc; i++)
+		    {
+		      if ((strcmp (argv[i], "filename") == 0
+			   || strcmp (argv[i], "name") == 0)
+			  && ++i < argc
+			  && argv[i][0] == '='
+			  && ++i < argc)
+			{
+			  name = normalize_path (dir, argv[i]);
+			  break;
+			}
+		    }
+		  mu_argcv_free (argc, argv);
+		}
+	      free (val);
+	    }
 	}
     }
-
+  
   if (!name)
     {
       char *fname = mhn_store_command (msg, part, prefix);