[svn-commits] kpfleming: trunk r409 - /trunk/menuselect.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Nov  5 08:09:54 2008
New Revision: 409

URL: http://svn.digium.com/view/menuselect?view=rev&rev=409
Log:
report all failures found during sanity_check()

Modified:
    trunk/menuselect.c

Modified: trunk/menuselect.c
URL: http://svn.digium.com/view/menuselect/trunk/menuselect.c?view=diff&rev=409&r1=408&r2=409
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Wed Nov  5 08:09:54 2008
@@ -1245,6 +1245,7 @@
 /*! \brief Make sure an existing menuselect.makeopts disabled everything it should have */
 static int sanity_check(void)
 {
+	unsigned int insane = 0;
 	struct category *cat;
 	struct member *mem;
 	struct depend *dep;
@@ -1278,6 +1279,7 @@
 						header_printed = 1;
 					}
 					fprintf(stderr, "          %s\n", mem->name);
+					insane = 1;
 				}
 			}
 		}
@@ -1296,6 +1298,7 @@
 						header_printed = 1;
 					}
 					fprintf(stderr, "          %s\n", mem->name);
+					insane = 1;
 				}
 			}
 		}
@@ -1318,11 +1321,12 @@
 					"  menuselect.makeopts file to resolve this issue.          \n"
 					"***********************************************************\n"
 					"\n", mem->name);
-				return -1;
-			}
-		}
-	}
-	return 0;	/* all good... */
+				insane = 1;
+			}
+		}
+	}
+
+	return insane ? -1 : 0;
 }
 
 /* \brief Set the forced default values if they exist */