[Pkg-shadow-commits] r2785 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-24 22:27:09 +0000 (Fri, 24 Apr 2009)
New Revision: 2785

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/faillog.c
Log:
	* src/faillog.c: Remove function calls from within assert().


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-24 22:22:57 UTC (rev 2784)
+++ upstream/trunk/ChangeLog	2009-04-24 22:27:09 UTC (rev 2785)
@@ -1,5 +1,9 @@
 2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/faillog.c: Remove function calls from within assert().
+
+2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/mail.c: Ignore the return value of puts().
 	* libmisc/mail.c: Prefer snprintf to sprintf, even if a small
 	context indicates no issues.

Modified: upstream/trunk/src/faillog.c
===================================================================
--- upstream/trunk/src/faillog.c	2009-04-24 22:22:57 UTC (rev 2784)
+++ upstream/trunk/src/faillog.c	2009-04-24 22:27:09 UTC (rev 2785)
@@ -105,7 +105,8 @@
 	offset = pw->pw_uid * sizeof (fl);
 	if (offset <= (statbuf.st_size - sizeof (fl))) {
 		/* fseeko errors are not really relevant for us. */
-		assert ( fseeko (fail, offset, SEEK_SET) == 0 );
+		int err = fseeko (fail, offset, SEEK_SET);
+		assert (0 == err);
 		/* faillog is a sparse file. Even if no entries were
 		 * entered for this user, which should be able to get the
 		 * empty entry in this case.
@@ -204,7 +205,8 @@
 	offset = uid * sizeof (fl);
 	if (offset <= (statbuf.st_size - sizeof (fl))) {
 		/* fseeko errors are not really relevant for us. */
-		assert ( fseeko (fail, offset, SEEK_SET) == 0 );
+		int err = fseeko (fail, offset, SEEK_SET);
+		assert (0 == err);
 		/* faillog is a sparse file. Even if no entries were
 		 * entered for this user, which should be able to get the
 		 * empty entry in this case.
@@ -290,7 +292,8 @@
 	offset = (off_t) uid * sizeof (fl);
 	if (offset <= (statbuf.st_size - sizeof (fl))) {
 		/* fseeko errors are not really relevant for us. */
-		assert ( fseeko (fail, offset, SEEK_SET) == 0 );
+		int err = fseeko (fail, offset, SEEK_SET);
+		assert (0 == err);
 		/* faillog is a sparse file. Even if no entries were
 		 * entered for this user, which should be able to get the
 		 * empty entry in this case.
@@ -380,7 +383,8 @@
 	offset = (off_t) uid * sizeof (fl);
 	if (offset <= (statbuf.st_size - sizeof (fl))) {
 		/* fseeko errors are not really relevant for us. */
-		assert ( fseeko (fail, offset, SEEK_SET) == 0 );
+		int err = fseeko (fail, offset, SEEK_SET);
+		assert (0 == err);
 		/* faillog is a sparse file. Even if no entries were
 		 * entered for this user, which should be able to get the
 		 * empty entry in this case.