sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

canplayer: convert skipgap to unsigned long 

The result of (last_log_tv.tv_sec - log_tv.tv_sec) is
unsigned long, so use labs() in order not to trim the
value to int. Make skipgap to unsigned long for the same
reason.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/2/head
Yegor Yefremov 2015-04-09 22:55:19 +02:00
parent 47fbe8fec2
commit 5846246ddd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
canplayer.c
View File

@ -86,7 +86,7 @@ void print_usage(char *prg)
"send frames immediately)\n"); "send frames immediately)\n");
fprintf(stderr, " -g <ms> (gap in milli " fprintf(stderr, " -g <ms> (gap in milli "
"seconds - default: %d ms)\n", DEFAULT_GAP); "seconds - default: %d ms)\n", DEFAULT_GAP);
fprintf(stderr, " -s <s> (skip gaps in " fprintf(stderr, " -s <s> (skip gaps in "
"timestamps > 's' seconds)\n"); "timestamps > 's' seconds)\n");
fprintf(stderr, " -x (disable local " fprintf(stderr, " -x (disable local "
"loopback of sent CAN frames)\n"); "loopback of sent CAN frames)\n");
@ -241,7 +241,8 @@ int main(int argc, char **argv)
FILE *infile = stdin; FILE *infile = stdin;
unsigned long gap = DEFAULT_GAP; unsigned long gap = DEFAULT_GAP;
int use_timestamps = 1; int use_timestamps = 1;
static int verbose, opt, delay_loops, skipgap; static int verbose, opt, delay_loops;
static unsigned long skipgap;
static int loopback_disable = 0; static int loopback_disable = 0;
static int infinite_loops = 0; static int infinite_loops = 0;
static int loops = DEFAULT_LOOPS; static int loops = DEFAULT_LOOPS;
@ -482,7 +483,7 @@ int main(int argc, char **argv)
/* test for logfile timestamps jumping backwards OR */ /* test for logfile timestamps jumping backwards OR */
/* if the user likes to skip long gaps in the timestamps */ /* if the user likes to skip long gaps in the timestamps */
if ((last_log_tv.tv_sec > log_tv.tv_sec) || if ((last_log_tv.tv_sec > log_tv.tv_sec) ||
(skipgap && abs(last_log_tv.tv_sec - log_tv.tv_sec) > skipgap)) (skipgap && labs(last_log_tv.tv_sec - log_tv.tv_sec) > skipgap))
create_diff_tv(&today_tv, &diff_tv, &log_tv); create_diff_tv(&today_tv, &diff_tv, &log_tv);
last_log_tv = log_tv; last_log_tv = log_tv;