[Pkg-shadow-commits] r1644 - in upstream/trunk: . lib

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-05 14:01:34 +0000 (Sat, 05 Jan 2008)
New Revision: 1644

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/commonio.c
Log:
stat shadows another stat variable. Remove this
variable, and directly check the result of getfscreatecon().


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-05 13:58:56 UTC (rev 1643)
+++ upstream/trunk/ChangeLog	2008-01-05 14:01:34 UTC (rev 1644)
@@ -31,6 +31,8 @@
 	* lib/gshdow.c: list() is an external function. DO not shadow it
 	with a static function. The internal list() was renamed
 	build_list().
+	* lib/commonio.c: stat shadows another stat variable. Remove this
+	variable, and directly check the result of getfscreatecon().
 
 2008-01-01  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/lib/commonio.c
===================================================================
--- upstream/trunk/lib/commonio.c	2008-01-05 13:58:56 UTC (rev 1643)
+++ upstream/trunk/lib/commonio.c	2008-01-05 14:01:34 UTC (rev 1644)
@@ -692,9 +692,7 @@
 		}
 #ifdef WITH_SELINUX
 		if (db->scontext != NULL) {
-			int stat = getfscreatecon (&old_context);
-
-			if (stat < 0) {
+			if (getfscreatecon (&old_context) < 0) {
 				errors++;
 				goto fail;
 			}