2014-09-10 06:42:43

by Gowtham Anandha Babu

Subject: [PATCH] tools/seq2bseq : Fix the same expression issue in if condition

Fix the usage of same expression on both sides of '||' in if

Below are the list of similar patches under 'tools' which are not yet reviewed

1) tools/csr_usb : Fix Resource leak: file
2) tools/hciattach : Fix syntax error
3) tools/btsnoop : Fix variable reassigning issue
---
tools/seq2bseq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/seq2bseq.c b/tools/seq2bseq.c
index 7657a57..521d20e 100644
--- a/tools/seq2bseq.c
+++ b/tools/seq2bseq.c
@@ -40,7 +40,7 @@ static int convert_line(int fd, const char *line)
char str[3];
unsigned char val;

- if (line[0] == '*' || line[0] == '\r' || line[0] == '\r')
+ if (line[0] == '*' || line[0] == '\r')
return 0;

while (1) {
--
1.9.1

2014-09-15 06:14:55

by Gowtham Anandha Babu

Subject: RE: [PATCH] tools/seq2bseq : Fix the same expression issue in if condition

Hi ,

> -----Original Message-----
> From: Marcel Holtmann [mailto:[email protected]]
> Sent: Friday, September 12, 2014 10:35 PM
> To: Johan Hedberg
> Cc: gowtham babu; [email protected];
> [email protected]; [email protected];
> [email protected]
> Subject: Re: [PATCH] tools/seq2bseq : Fix the same expression issue in if
> condition
>
> Hi Johan,
>
> >> Below are the list of similar patches under 'tools' which are not yet
> >> reviewed
> >>
> >> 1) tools/csr_usb : Fix Resource leak: file
> >> 2) tools/hciattach : Fix syntax error
> >> 3) tools/btsnoop : Fix variable reassigning issue
> >
> > This kind of stuff does not belong in a commit message.
> >
> >> diff --git a/tools/seq2bseq.c b/tools/seq2bseq.c index
> >> 7657a57..521d20e 100644
> >> --- a/tools/seq2bseq.c
> >> +++ b/tools/seq2bseq.c
> >> @@ -40,7 +40,7 @@ static int convert_line(int fd, const char *line)
> >> char str[3];
> >> unsigned char val;
> >>
> >> - if (line[0] == '*' || line[0] == '\r' || line[0] == '\r')
> >> + if (line[0] == '*' || line[0] == '\r')
> >> return 0;
> >>
> >> while (1) {
> >
> > Are you sure the code wasn't intending to check for '\n'?
>
> yes, it was intended to check for \r and \n. This is my mistake here.
>
> Regards
>
> Marcel

I had fixed this and sent the revised patch. Please have a look at it.

Regards,
Gowtham

2014-09-12 17:05:12

by Marcel Holtmann

Subject: Re: [PATCH] tools/seq2bseq : Fix the same expression issue in if condition

Hi Johan,

>> Below are the list of similar patches under 'tools' which are not yet reviewed
>>
>> 1) tools/csr_usb : Fix Resource leak: file
>> 2) tools/hciattach : Fix syntax error
>> 3) tools/btsnoop : Fix variable reassigning issue
>
> This kind of stuff does not belong in a commit message.
>
>> diff --git a/tools/seq2bseq.c b/tools/seq2bseq.c
>> index 7657a57..521d20e 100644
>> --- a/tools/seq2bseq.c
>> +++ b/tools/seq2bseq.c
>> @@ -40,7 +40,7 @@ static int convert_line(int fd, const char *line)
>> char str[3];
>> unsigned char val;
>>
>> - if (line[0] == '*' || line[0] == '\r' || line[0] == '\r')
>> + if (line[0] == '*' || line[0] == '\r')
>> return 0;
>>
>> while (1) {
>
> Are you sure the code wasn't intending to check for '\n'?

yes, it was intended to check for \r and \n. This is my mistake here.

Regards

Marcel

2014-09-12 16:57:30

by Johan Hedberg

Subject: Re: [PATCH] tools/seq2bseq : Fix the same expression issue in if condition

Hi,

On Wed, Sep 10, 2014, gowtham babu wrote:
> Below are the list of similar patches under 'tools' which are not yet reviewed
>
> 1) tools/csr_usb : Fix Resource leak: file
> 2) tools/hciattach : Fix syntax error
> 3) tools/btsnoop : Fix variable reassigning issue

This kind of stuff does not belong in a commit message.

> diff --git a/tools/seq2bseq.c b/tools/seq2bseq.c
> index 7657a57..521d20e 100644
> --- a/tools/seq2bseq.c
> +++ b/tools/seq2bseq.c
> @@ -40,7 +40,7 @@ static int convert_line(int fd, const char *line)
> char str[3];
> unsigned char val;
>
> - if (line[0] == '*' || line[0] == '\r' || line[0] == '\r')
> + if (line[0] == '*' || line[0] == '\r')
> return 0;
>
> while (1) {

Are you sure the code wasn't intending to check for '\n'?

Johan