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:45 UTC

[incubator-nuttx-apps] 01/02: Revert "Fix printf compile warning regarding time_t"

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 a875ed2be725567380087e857dffabb5470363d5
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Tue Nov 24 16:06:05 2020 +0900

    Revert "Fix printf compile warning regarding time_t"
    
    This reverts commit 8cde672b5b8620b8cc0e3dcbc6051907194dacdb.
    
    NuttX's time_t is uint32_t.
    It's wrong to assume it either long or int.
---
 canutils/candump/candump.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/canutils/candump/candump.c b/canutils/candump/candump.c
index fa427c9..4bfa107 100644
--- a/canutils/candump/candump.c
+++ b/canutils/candump/candump.c
@@ -709,7 +709,7 @@ int main(int argc, char **argv)
 
 					/* log CAN frame with absolute timestamp & device */
 					sprint_canframe(buf, &frame, 0, maxdlen);
-					fprintf(logfile, "(%010u.%06ld) %*s %s\n",
+					fprintf(logfile, "(%010ld.%06ld) %*s %s\n",
 						tv.tv_sec, tv.tv_usec,
 						max_devname_len, devname[idx], buf);
 				}
@@ -738,7 +738,7 @@ int main(int argc, char **argv)
 				switch (timestamp) {
 
 				case 'a': /* absolute with timestamp */
-					printf("(%010u.%06ld) ", tv.tv_sec, tv.tv_usec);
+					printf("(%010ld.%06ld) ", tv.tv_sec, tv.tv_usec);
 					break;
 
 				case 'A': /* absolute with date */
@@ -765,7 +765,7 @@ 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("(%03u.%06ld) ", diff.tv_sec, diff.tv_usec);
+					printf("(%03ld.%06ld) ", diff.tv_sec, diff.tv_usec);
 				
 					if (timestamp == 'd')
 						last_tv = tv; /* update for delta calculation */