vim: src/misc2.c comparison

A few more fixes for undo file. Split test in two parts so that it doesn't fail with tiny features.

comparison

equal deleted inserted replaced

-:aa6412cab544
+:2e6906bbc5f4
 time_t	wtime = the_time;
 /* time_t can be up to 8 bytes in size, more than long_u, thus we
 * can't use put_bytes() here.
 * Another problem is that ">>" may do an arithmetic shift that keeps the
-* sign.  A cast to long_u may truncate if time_t is 8 bytes.  So only use
+* sign.  This happens for large values of wtime.  A cast to long_u may
-* a cast when it is 4 bytes, it's safe to assume that long_u is 4 bytes
+* truncate if time_t is 8 bytes.  So only use a cast when it is 4 bytes,
-* or more and when using 8 bytes the top bit won't be set. */
+* it's safe to assume that long_u is 4 bytes or more and when using 8
+* bytes the top bit won't be set. */
 for (i = 7; i >= 0; --i)
 {
 	if (i + 1 > (int)sizeof(time_t))
 	    /* ">>" doesn't work well when shifting more bits than avail */
 	    putc(0, fd);
 	else
 	{
-	    /* use "i" in condition to avoid compiler warning */
+#if defined(SIZEOF_TIME_T) && SIZEOF_TIME_T > 4
-	    if (i >= 0 && sizeof(time_t) > 4)
+	    c = wtime >> (i * 8);
-		c = wtime >> (i * 8);
+#else
-	    else
+	    c = (long_u)wtime >> (i * 8);
-		c = (long_u)wtime >> (i * 8);
+#endif
 	    putc(c, fd);
 	}
 }
 }

Mercurial > vim