[Pkg-shadow-commits] r1603 - upstream/trunk/src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-01 15:52:07 +0000 (Tue, 01 Jan 2008)
New Revision: 1603

Modified:
   upstream/trunk/src/pwck.c
Log:
Simplify pwck's main(). Remove gotos.


Modified: upstream/trunk/src/pwck.c
===================================================================
--- upstream/trunk/src/pwck.c	2008-01-01 15:49:33 UTC (rev 1602)
+++ upstream/trunk/src/pwck.c	2008-01-01 15:52:07 UTC (rev 1603)
@@ -606,19 +606,14 @@
 		if (is_shadow)
 			spw_sort ();
 		changed = 1;
-		goto write_and_bye;
+	} else {
+		check_pw_file (&errors, &changed);
+
+		if (is_shadow) {
+			check_spw_file (&errors, &changed);
+		}
 	}
 
-	check_pw_file (&errors, &changed);
-
-	if (!is_shadow)
-		goto shadow_done;
-
-	check_spw_file (&errors, &changed);
-
-      shadow_done:
-
-      write_and_bye:
 	close_files (changed);
 
 	nscd_flush_cache ("passwd");