From: Eric Blake <ebb9@byu.net>
Date: Fri, 30 Oct 2009 12:48:14 +0000 (-0600)
Subject: exclude: make more robust
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5cdd7ee599857815bb1bffd4953b46b16dbaf7;p=pspp

exclude: make more robust

* lib/exclude.c (excluded_file_name): Abort on unexpected value,
rather than masking a coding bug.
Suggested by Bruno Haible.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 561e6d4ac6..c146bcb53a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-30  Eric Blake  <ebb9@byu.net>
+
+	exclude: make more robust
+	* lib/exclude.c (excluded_file_name): Abort on unexpected value,
+	rather than masking a coding bug.
+	Suggested by Bruno Haible.
+
 2009-10-30  Jim Meyering  <meyering@redhat.com>
 
 	perl scripts: remove #!/usr/bin/perl in favor of more portable...
diff --git a/lib/exclude.c b/lib/exclude.c
index 310c5abc24..d1b421d47e 100644
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -412,9 +412,7 @@ excluded_file_name (struct exclude const *ex, char const *f)
      excluded to included or vice versa.  */
   for (seg = ex->head; seg; seg = seg->next)
     {
-      /* Pacify gcc, so it doesn't issue a spurious
-	 "may be used uninitialized" warning.  */
-      bool rc = excluded;
+      bool rc;
 
       switch (seg->type)
 	{
@@ -427,6 +425,9 @@ excluded_file_name (struct exclude const *ex, char const *f)
 	    filename = xmalloc (strlen (f) + 1);
 	  rc = excluded_file_name_p (seg, f, filename);
 	  break;
+
+	default:
+	  abort ();
 	}
       if (rc != excluded)
 	{