From: Jim Meyering Date: Thu, 5 Feb 2004 13:46:41 +0000 (+0000) Subject: (human_time): Correct merge problem. X-Git-Tag: v5.1.3~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5937c873e6ed036d98493ceff8dd336a68fe792e;p=thirdparty%2Fcoreutils.git (human_time): Correct merge problem. --- diff --git a/src/stat.c b/src/stat.c index 15ebded3ea..527ccf2fe7 100644 --- a/src/stat.c +++ b/src/stat.c @@ -333,7 +333,7 @@ human_time (time_t t, int t_ns) (INT_STRLEN_BOUND (int) /* YYYY */ + 1 /* because YYYY might equal INT_MAX + 1900 */ + sizeof "-MM-DD HH:MM:SS.NNNNNNNNN +ZZZZ"))]; - struct tm const *tm = localtime (t); + struct tm const *tm = localtime (&t); if (tm == NULL) return (TYPE_SIGNED (time_t) ? imaxtostr (t, str)