* [PATCH] canplayer: convert skipgap to unsigned long
@ 2015-04-09 21:01 Yegor Yefremov
2015-04-10 9:29 ` Oliver Hartkopp
0 siblings, 1 reply; 5+ messages in thread
From: Yegor Yefremov @ 2015-04-09 21:01 UTC (permalink / raw)
To: linux-can; +Cc: Yegor Yefremov
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>
---
canplayer.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/canplayer.c b/canplayer.c
index f74668e..437ed4b 100644
--- a/canplayer.c
+++ b/canplayer.c
@@ -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;
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] canplayer: convert skipgap to unsigned long
2015-04-09 21:01 [PATCH] canplayer: convert skipgap to unsigned long Yegor Yefremov
@ 2015-04-10 9:29 ` Oliver Hartkopp
2015-04-10 9:33 ` Yegor Yefremov
0 siblings, 1 reply; 5+ messages in thread
From: Oliver Hartkopp @ 2015-04-10 9:29 UTC (permalink / raw)
To: Yegor Yefremov, linux-can
On 09.04.2015 23:01, Yegor Yefremov wrote:
> 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.
>
Yes. And additionally
skipgap = strtoul(optarg, NULL, 10);
should have pointed me to use unsigned long m)
Thanks Yegor!
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Regards,
Oliver
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> canplayer.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/canplayer.c b/canplayer.c
> index f74668e..437ed4b 100644
> --- a/canplayer.c
> +++ b/canplayer.c
> @@ -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;
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] canplayer: convert skipgap to unsigned long
2015-04-10 9:29 ` Oliver Hartkopp
@ 2015-04-10 9:33 ` Yegor Yefremov
2015-04-10 9:37 ` Oliver Hartkopp
0 siblings, 1 reply; 5+ messages in thread
From: Yegor Yefremov @ 2015-04-10 9:33 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
On Fri, Apr 10, 2015 at 11:29 AM, Oliver Hartkopp
<socketcan@hartkopp.net> wrote:
>
>
> On 09.04.2015 23:01, Yegor Yefremov wrote:
>>
>> 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.
>>
>
> Yes. And additionally
>
> skipgap = strtoul(optarg, NULL, 10);
>
> should have pointed me to use unsigned long m)
Btw. should we initialize skipgap with 0?
>
> Thanks Yegor!
>
> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
>
> Regards,
> Oliver
>
>
>> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>> ---
>> canplayer.c | 7 ++++---
>> 1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/canplayer.c b/canplayer.c
>> index f74668e..437ed4b 100644
>> --- a/canplayer.c
>> +++ b/canplayer.c
>> @@ -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;
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] canplayer: convert skipgap to unsigned long
2015-04-10 9:33 ` Yegor Yefremov
@ 2015-04-10 9:37 ` Oliver Hartkopp
2015-04-10 9:37 ` Yegor Yefremov
0 siblings, 1 reply; 5+ messages in thread
From: Oliver Hartkopp @ 2015-04-10 9:37 UTC (permalink / raw)
To: Yegor Yefremov; +Cc: linux-can@vger.kernel.org
On 10.04.2015 11:33, Yegor Yefremov wrote:
> On Fri, Apr 10, 2015 at 11:29 AM, Oliver Hartkopp
>> Yes. And additionally
>>
>> skipgap = strtoul(optarg, NULL, 10);
>>
>> should have pointed me to use unsigned long m)
>
> Btw. should we initialize skipgap with 0?
>
static unsigned long skipgap;
^^^^^^
Does it for you :-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] canplayer: convert skipgap to unsigned long
2015-04-10 9:37 ` Oliver Hartkopp
@ 2015-04-10 9:37 ` Yegor Yefremov
0 siblings, 0 replies; 5+ messages in thread
From: Yegor Yefremov @ 2015-04-10 9:37 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: linux-can@vger.kernel.org
On Fri, Apr 10, 2015 at 11:37 AM, Oliver Hartkopp
<socketcan@hartkopp.net> wrote:
> On 10.04.2015 11:33, Yegor Yefremov wrote:
>>
>> On Fri, Apr 10, 2015 at 11:29 AM, Oliver Hartkopp
>
>
>
>>> Yes. And additionally
>>>
>>> skipgap = strtoul(optarg, NULL, 10);
>>>
>>> should have pointed me to use unsigned long m)
>>
>>
>> Btw. should we initialize skipgap with 0?
>>
>
> static unsigned long skipgap;
> ^^^^^^
>
> Does it for you :-)
You live, you learn :-)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-04-10 9:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-09 21:01 [PATCH] canplayer: convert skipgap to unsigned long Yegor Yefremov
2015-04-10 9:29 ` Oliver Hartkopp
2015-04-10 9:33 ` Yegor Yefremov
2015-04-10 9:37 ` Oliver Hartkopp
2015-04-10 9:37 ` Yegor Yefremov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.