From: Richard Yao <ryao@gentoo.org>
Date: Sun, 9 Apr 2017 19:00:03 +0000 (-0400)
Subject: Fix `zpool iostat -T d 1` on musl
X-Git-Tag: zfs-0.7.0-rc4~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=281f1fa30ac3558d0e5e1573bdb9113291815bcd;p=zfs

Fix `zpool iostat -T d 1` on musl

When building on Gentoo against musl, GCC complains:

timestamp.c: In function ‘print_timestamp’:
timestamp.c:32:19: warning: passing argument 1 of ‘nl_langinfo’ makes
integer from pointer without a cast
 #define _DATE_FMT "%+"
                   ^
timestamp.c:47:21: note: in expansion of macro ‘_DATE_FMT’
   fmt = nl_langinfo(_DATE_FMT);
                     ^
The error was wrapped to meet comment style requirements.

This code is used by `zpool iostat -T d 1` to print a date and upon
testing it, I see no date printed. Lets use D_T_FMT so that something
gets printed and if D_T_FMT is not avaliable, then we can fall back to
"%+".

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Richard Yao <ryao@gentoo.org>
Closes #5993
---

diff --git a/lib/libspl/timestamp.c b/lib/libspl/timestamp.c
index e2838da12..eab15f3f1 100644
--- a/lib/libspl/timestamp.c
+++ b/lib/libspl/timestamp.c
@@ -29,8 +29,12 @@
 #include "statcommon.h"
 
 #ifndef _DATE_FMT
+#ifdef D_T_FMT
+#define	_DATE_FMT D_T_FMT
+#else /* D_T_FMT */
 #define	_DATE_FMT "%+"
-#endif
+#endif /* !D_T_FMT */
+#endif /* _DATE_FMT */
 
 /*
  * Print timestamp as decimal reprentation of time_t value (-T u was specified)