Changeset 5445:f41ba27be46f

Timestamp:

2008-07-02 09:08:07 (8 weeks ago)

Author:

Rocco Rutte <pdmef@…>

Branch:

HEAD

Message:

Fix casts for progress update to prevent -ftrapv aborts to trigger. Closes #3018.

Files:

• ChangeLog (modified) (1 diff)
• curs_lib.c (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2008-07-02 08:56 -0700  Brendan Cully  <brendan@kublai.com>  (c51c16db46cc)
+
+        * crypt-gpgme.c: Only make LC_MESSAGES conditional on NLS in GPGME
+        locale support.
+
+2008-07-02 11:19 +0200  Rocco Rutte  <pdmef@gmx.net>  (8b783c916893)
+
+        * ChangeLog, browser.c, buffy.c, commands.c, compose.c, curs_main.c,
+        enter.c, headers.c, hook.c, imap/imap.c, init.c, mbox.c, muttlib.c,
+        postpone.c, protos.h, recvattach.c, send.c, status.c: Use realpath()
+        in mutt_pretty_mailbox() for paths that may need it. This requires
+        to add the buffer size as parameter since the result may be longer
+        than the original but still fit in the buffer. Closes #2948.
+
 2008-07-02 10:06 +0200  Rocco Rutte  <pdmef@gmx.net>  (cc2334fdf126)
 

curs_lib.c

@@ -378 +378 @@
   /* if timestamp is 0 no time-based suppression is done */
   if (TimeInc)
-    progress->timestamp = (unsigned int) (tv.tv_sec * 1000)
+    progress->timestamp = ((unsigned int) tv.tv_sec * 1000)
         + (unsigned int) (tv.tv_usec / 1000);
   mutt_progress_update (progress, 0, 0);
@@ -402 +402 @@
   /* skip refresh if not enough time has passed */
   if (update && progress->timestamp && !gettimeofday (&tv, NULL)) {
-    now = (unsigned int) (tv.tv_sec * 1000)
+    now = ((unsigned int) tv.tv_sec * 1000)
           + (unsigned int) (tv.tv_usec / 1000);
     if (now && now - progress->timestamp < TimeInc)