2 files changed, 3 insertions, 4 deletions
diff --git a/main.c b/main.c
index c315827..cad697a 100644
--- a/main.c
+++ b/main.c
@@ -1514,10 +1514,9 @@ int main (int argc, char ** argv)
 
 	    if (any_remade)
 	      goto re_exec;
-	    else if (any_failed)
+	    if (any_failed)
 	      die (2);
-	    else
-	      break;
+            break;
 	  }
 
 	case 0:
diff --git a/remake.c b/remake.c
index d94094a..d39c558 100644
--- a/remake.c
+++ b/remake.c
@@ -125,7 +125,7 @@ update_goal_chain (goals, makefiles)
       while (g != 0)
 	{
 	  /* Iterate over all double-colon entries for this file.  */
-	  struct file *file = g->file;
+	  struct file *file;
 	  int stop = 0, any_not_updated = 0;
 
 	  for (file = g->file->double_colon ? g->file->double_colon : g->file;