You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/24 08:11:46 UTC
[incubator-nuttx-apps] 02/02: canutils/candump/candump.c: Fix
printf formats
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 747ca594d66131f9f050bcf142379e130a5c2a2b
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue Nov 24 16:09:45 2020 +0900
canutils/candump/candump.c: Fix printf formats
---
canutils/candump/candump.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/canutils/candump/candump.c b/canutils/candump/candump.c
index 4bfa107..a166356 100644
--- a/canutils/candump/candump.c
+++ b/canutils/candump/candump.c
@@ -709,8 +709,8 @@ int main(int argc, char **argv)
/* log CAN frame with absolute timestamp & device */
sprint_canframe(buf, &frame, 0, maxdlen);
- fprintf(logfile, "(%010ld.%06ld) %*s %s\n",
- tv.tv_sec, tv.tv_usec,
+ fprintf(logfile, "(%010ju.%06ld) %*s %s\n",
+ (uintmax_t)tv.tv_sec, tv.tv_usec,
max_devname_len, devname[idx], buf);
}
@@ -719,8 +719,8 @@ int main(int argc, char **argv)
/* print CAN frame in log file style to stdout */
sprint_canframe(buf, &frame, 0, maxdlen);
- printf("(%010ld.%06ld) %*s %s\n",
- tv.tv_sec, tv.tv_usec,
+ printf("(%010ju.%06ld) %*s %s\n",
+ (uintmax_t)tv.tv_sec, tv.tv_usec,
max_devname_len, devname[idx], buf);
goto out_fflush; /* no other output to stdout */
}
@@ -738,7 +738,8 @@ int main(int argc, char **argv)
switch (timestamp) {
case 'a': /* absolute with timestamp */
- printf("(%010ld.%06ld) ", tv.tv_sec, tv.tv_usec);
+ printf("(%010ju.%06ld) ",
+ (uintmax_t)tv.tv_sec, tv.tv_usec);
break;
case 'A': /* absolute with date */
@@ -765,7 +766,8 @@ int main(int argc, char **argv)
diff.tv_sec--, diff.tv_usec += 1000000;
if (diff.tv_sec < 0)
diff.tv_sec = diff.tv_usec = 0;
- printf("(%03ld.%06ld) ", diff.tv_sec, diff.tv_usec);
+ printf("(%03ju.%06ld) ",
+ (uintmax_t)diff.tv_sec, diff.tv_usec);
if (timestamp == 'd')
last_tv = tv; /* update for delta calculation */