* libmisc/log.c: Avoid assignments in comparisons.

	* libmisc/log.c: Add brackets and parenthesis.
	* libmisc/log.c: read() returns a ssize_t (note size_t).
	* libmisc/log.c: Avoid implicit conversion of pointers to
	booleans.
	* libmisc/log.c: Ignore return value of time() when use with a
	non NULL argument.

diff --git a/ChangeLog b/ChangeLog
index 4988e9e6ac80d6f7106779e1061cadfa9d342678..6326af00538dea3336b28c3d13765679e9d1ea97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/log.c: Avoid assignments in comparisons.
+       * libmisc/log.c: Add brackets and parenthesis.
+       * libmisc/log.c: read() returns a ssize_t (note size_t).
+       * libmisc/log.c: Avoid implicit conversion of pointers to
+       booleans.
+       * libmisc/log.c: Ignore return value of time() when use with a
+       non NULL argument.
+
 2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/strtoday.c: Avoid implicit conversion of pointers to

diff --git a/libmisc/log.c b/libmisc/log.c
index 9582534e0955423f994269c9bd65576a239ba24a..35a219533f10b858df6a8abf73e8e2614c6edb3a 100644 (file)
--- a/libmisc/log.c
+++ b/libmisc/log.c
@@ -62,8 +62,10 @@ dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line,
         * If the file does not exist, don't create it.
         */
 
-       if ((fd = open (LASTLOG_FILE, O_RDWR)) == -1)
+       fd = open (LASTLOG_FILE, O_RDWR);
+       if (-1 == fd) {
                return;
+       }
 
        /*
         * The file is indexed by UID number.  Seek to the record
@@ -83,19 +85,23 @@ dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line,
         * the way we read the old one in.
         */
 
-       if (read (fd, (char *) &newlog, sizeof newlog) != sizeof newlog)
+       if (read (fd, (char *) &newlog, sizeof newlog) != (ssize_t) sizeof newlog) {
                memzero (&newlog, sizeof newlog);
-       if (ll)
+       }
+       if (NULL != ll) {
                *ll = newlog;
+       }
 
        ll_time = newlog.ll_time;
-       time (&ll_time);
+       (void) time (&ll_time);
        newlog.ll_time = ll_time;
        strncpy (newlog.ll_line, line, sizeof newlog.ll_line);
 #if HAVE_LL_HOST
        strncpy (newlog.ll_host, host, sizeof newlog.ll_host);
 #endif
-       if (lseek (fd, offset, SEEK_SET) == offset)
+       if (lseek (fd, offset, SEEK_SET) == offset) {
                write (fd, (char *) &newlog, sizeof newlog);
+       }
        close (fd);
 }
+