* src/faillog.c: Ignore return value of time() when use with a

	non NULL argument.
	* src/faillog.c: Use a %lu format and cast number of days to
	unsigned long integers.
	* src/faillog.c: Cast dates to time_t.

diff --git a/ChangeLog b/ChangeLog
index 095d39ea33b693ef2d9b00da9bd457e21c6dfd66..2b335692ec699b203146fad89b333b3a8d4b88d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/faillog.c: Ignore return value of time() when use with a
+       non NULL argument.
+       * src/faillog.c: Use a %lu format and cast number of days to
+       unsigned long integers.
+       * src/faillog.c: Cast dates to time_t.
+
 2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
 
        * src/login.c: Ignore the return value of signal().

diff --git a/src/faillog.c b/src/faillog.c
index 59e8b6045e74ff57657e2db5acf339ee4a93e7cb..2501b029e082e80577ec30601d57e1bcc84d909e 100644 (file)
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -96,7 +96,7 @@ static void print_one (const struct faillog *fl, uid_t uid)
                once = true;
        }
        pwent = getpwuid (uid); /* local, no need for xgetpwuid */
-       time (&now);
+       (void) time (&now);
        tm = localtime (&fl->fail_time);
 #ifdef HAVE_STRFTIME
        strftime (ptime, sizeof (ptime), "%D %H:%M:%S %z", tm);
@@ -111,12 +111,11 @@ static void print_one (const struct faillog *fl, uid_t uid)
                        if (0 != fl->fail_locktime) {
                                if (   ((fl->fail_time+fl->fail_locktime) > now)
                                    && (0 != fl->fail_cnt)) {
-                                       printf (_(" [%lds left]"),
-                                               fl->fail_time +
-                                               fl->fail_locktime - now);
+                                       printf (_(" [%lus left]"),
+                                               (unsigned long) fl->fail_time + fl->fail_locktime - now);
                                } else {
                                        printf (_(" [%lds lock]"),
-                                               fl->fail_locktime);
+                                               fl->fail_locktime);
                                }
                        }
                }
@@ -373,7 +372,7 @@ int main (int argc, char **argv)
                                break;
                        case 't':
                                days = atoi (optarg);
-                               seconds = days * DAY;
+                               seconds = (time_t) days * DAY;
                                tflg = true;
                                break;
                        case 'u':