From b766fb75fa69ad37d38d26b9296a7ea2733e4382 Mon Sep 17 00:00:00 2001 From: nirenjan Date: Sat, 11 Jul 2020 10:18:00 -0700 Subject: [PATCH] Make timeval printing portable --- po/x52pro-linux.pot | 6 +++--- po/xx_PL.po | 10 +++++----- utils/evtest/ev_test.c | 6 ++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/po/x52pro-linux.pot b/po/x52pro-linux.pot index 110fd7f..110bfc2 100644 --- a/po/x52pro-linux.pot +++ b/po/x52pro-linux.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: x52pro-linux 0.2.1\n" "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n" -"POT-Creation-Date: 2020-07-11 00:17-0700\n" +"POT-Creation-Date: 2020-07-11 10:41-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,9 +114,9 @@ msgstr "" msgid "Testing (interrupt to exit)\n" msgstr "" -#: utils/evtest/ev_test.c:117 utils/evtest/ev_test.c:123 +#: utils/evtest/ev_test.c:117 utils/evtest/ev_test.c:124 #, c-format -msgid "Event @ %ld.%09lu: %s, value %d\n" +msgid "Event @ %ld.%06ld: %s, value %d\n" msgstr "" #: utils/test/x52_test.c:97 diff --git a/po/xx_PL.po b/po/xx_PL.po index 6434f90..cf4abd9 100644 --- a/po/xx_PL.po +++ b/po/xx_PL.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: x52pro-linux 0.2.1\n" "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n" -"POT-Creation-Date: 2020-07-11 00:17-0700\n" -"PO-Revision-Date: 2020-07-11 00:19-0700\n" +"POT-Creation-Date: 2020-07-11 10:41-0700\n" +"PO-Revision-Date: 2020-07-11 10:45-0700\n" "Last-Translator: Nirenjan Krishnan \n" "Language-Team: Dummy Language for testing i18n\n" "Language: xx_PL\n" @@ -114,10 +114,10 @@ msgstr "Eadray imeouttay" msgid "Testing (interrupt to exit)\n" msgstr "Estingtay (interruptay otay exitay)\n" -#: utils/evtest/ev_test.c:117 utils/evtest/ev_test.c:123 +#: utils/evtest/ev_test.c:117 utils/evtest/ev_test.c:124 #, c-format -msgid "Event @ %ld.%09lu: %s, value %d\n" -msgstr "Eventay @ %ld.%09lu: %s, aluevay %d\n" +msgid "Event @ %ld.%06ld: %s, value %d\n" +msgstr "Eventay @ %ld.%06ld: %s, aluevay %d\n" #: utils/test/x52_test.c:97 msgid "Test brightness scale (~ 1m)" diff --git a/utils/evtest/ev_test.c b/utils/evtest/ev_test.c index f9725dd..a00bf2f 100644 --- a/utils/evtest/ev_test.c +++ b/utils/evtest/ev_test.c @@ -114,13 +114,15 @@ int main(int argc, char **argv) puts(""); for (int axis = 0; axis < LIBX52IO_AXIS_MAX; axis++) { if (last.axis[axis] != curr.axis[axis]) { - printf(_("Event @ %ld.%09lu: %s, value %d\n"), tv.tv_sec, tv.tv_usec, + printf(_("Event @ %ld.%06ld: %s, value %d\n"), + (long int)tv.tv_sec, (long int)tv.tv_usec, libx52io_axis_to_str(axis), curr.axis[axis]); } } for (int btn = 0; btn < LIBX52IO_BUTTON_MAX; btn++) { if (last.button[btn] != curr.button[btn]) { - printf(_("Event @ %ld.%09lu: %s, value %d\n"), tv.tv_sec, tv.tv_usec, + printf(_("Event @ %ld.%06ld: %s, value %d\n"), + (long int)tv.tv_sec, (long int)tv.tv_usec, libx52io_button_to_str(btn), curr.button[btn]); } }