Author: dim
Date: Tue Nov 25 12:19:05 2014
New Revision: 275031
URL: https://svnweb.freebsd.org/changeset/base/275031
Log:
MFC r274846:
Fix the following -Werror warning from clang 3.5.0, while building
usr.bin/cpio on amd64 (or any arch with 64-bit time_t):
contrib/libarchive/cpio/cpio.c:1143:6: error: absolute value function 'abs'
given an argument of type 'long' but has parameter of type 'int' which may
cause truncation of value [-Werror,-Wabsolute-value]
if (abs(mtime - now) > (365/2)*86400)
^
contrib/libarchive/cpio/cpio.c:1143:6: note: use function 'labs' instead
if (abs(mtime - now) > (365/2)*86400)
^~~
labs
1 error generated.
This is because time_t is a long on amd64. To avoid the warning, just
copy the equivalent test from a few lines before, which is used in the
Windows case, and which is type safe.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D1198
Modified:
stable/10/contrib/libarchive/cpio/cpio.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/9/contrib/libarchive/cpio/cpio.c
Directory Properties:
stable/9/contrib/libarchive/ (props changed)
Modified: stable/10/contrib/libarchive/cpio/cpio.c
==============================================================================
--- stable/10/contrib/libarchive/cpio/cpio.c Tue Nov 25 11:23:12 2014
(r275030)
+++ stable/10/contrib/libarchive/cpio/cpio.c Tue Nov 25 12:19:05 2014
(r275031)
@@ -1140,7 +1140,8 @@ list_item_verbose(struct cpio *cpio, str
else
fmt = cpio->day_first ? "%d %b %H:%M" : "%b %d %H:%M";
#else
- if (abs(mtime - now) > (365/2)*86400)
+ if (mtime - now > 365*86400/2
+ || mtime - now < -365*86400/2)
fmt = cpio->day_first ? "%e %b %Y" : "%b %e %Y";
else
fmt = cpio->day_first ? "%e %b %H:%M" : "%b %e %H:%M";
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
