]> rtime.felk.cvut.cz Git - can-utils.git/commitdiff
canplayer: convert skipgap to unsigned long
authorYegor Yefremov <yegorslists@googlemail.com>
Thu, 9 Apr 2015 20:55:19 +0000 (22:55 +0200)
committerYegor Yefremov <yegorslists@googlemail.com>
Fri, 10 Apr 2015 19:20:58 +0000 (21:20 +0200)
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>
canplayer.c

index f74668e0fa6e597f4ef9b353da0701069cbd049a..437ed4bc8aef4c9cc3fc75de6952086de6de8034 100644 (file)
@@ -86,7 +86,7 @@ void print_usage(char *prg)
                "send frames immediately)\n");
        fprintf(stderr, "                      -g <ms>      (gap in milli "
                "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");
        fprintf(stderr, "                      -x           (disable local "
                "loopback of sent CAN frames)\n");
@@ -241,7 +241,8 @@ int main(int argc, char **argv)
        FILE *infile = stdin;
        unsigned long gap = DEFAULT_GAP; 
        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 infinite_loops = 0;
        static int loops = DEFAULT_LOOPS;
@@ -482,7 +483,7 @@ int main(int argc, char **argv)
                                        /* test for logfile timestamps jumping backwards OR      */
                                        /* if the user likes to skip long gaps in the timestamps */
                                        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);
 
                                        last_log_tv = log_tv;