mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
(human_time): Correct merge problem.
This commit is contained in:
1 parent
8b2ed3ed95
commit
5937c873e6
1 file changed
+1
-1
+1
-1
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user