| Current Path : /usr/src/gnu/usr.bin/diff/ |
FreeBSD hs32.drive.ne.jp 9.1-RELEASE FreeBSD 9.1-RELEASE #1: Wed Jan 14 12:18:08 JST 2015 root@hs32.drive.ne.jp:/sys/amd64/compile/hs32 amd64 |
| Current File : //usr/src/gnu/usr.bin/diff/context.c.diff |
$FreeBSD: release/9.1.0/gnu/usr.bin/diff/context.c.diff 205793 2010-03-28 13:16:08Z ed $
--- context.c.orig 2004-04-12 15:44:35.000000000 +0800
+++ context.c 2007-06-16 22:25:11.705063242 +0800
@@ -29,7 +29,7 @@
# define TIMESPEC_NS(timespec) 0
#endif
-size_t nstrftime (char *, size_t, char const *, struct tm const *, int, int);
+size_t nstrftime (char *, size_t, char const *, struct tm const *, int, long);
static char const *find_function (char const * const *, lin);
static struct change *find_hunk (struct change *);
@@ -57,12 +57,12 @@
char buf[MAX (INT_STRLEN_BOUND (int) + 32,
INT_STRLEN_BOUND (time_t) + 11)];
struct tm const *tm = localtime (&inf->stat.st_mtime);
- int nsec = TIMESPEC_NS (inf->stat.st_mtim);
+ long nsec = TIMESPEC_NS (inf->stat.st_mtim);
if (! (tm && nstrftime (buf, sizeof buf, time_format, tm, 0, nsec)))
{
- long int sec = inf->stat.st_mtime;
+ time_t sec = inf->stat.st_mtime;
verify (info_preserved, sizeof inf->stat.st_mtime <= sizeof sec);
- sprintf (buf, "%ld.%.9d", sec, nsec);
+ sprintf (buf, "%jd.%.9d", (intmax_t)sec, nsec);
}
fprintf (outfile, "%s %s\t%s\n", mark, inf->name, buf);
}