[2.6 patch] mtd/cmdlinepart.c: don't compare pointers with 0

[Adrian Bunk]

Sparse spotted that 0 was compared to pointers.

While I was at it, I also moved the assignments out of the if's.

Signed-off-by: Adrian Bunk <bu...@kernel.org>

---

drivers/mtd/cmdlinepart.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

32de76e83f37322dd85eaecf126e7b17327f606f diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index b44292a..3e09043 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -119,7 +119,8 @@ static struct mtd_partition * newpart(char *s,
char *p;

name = ++s;
- if ((p = strchr(name, delim)) == 0)
+ p = strchr(name, delim);
+ if (!p)
{
printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
return NULL;
@@ -159,9 +160,10 @@ static struct mtd_partition * newpart(char *s,
return NULL;
}
/* more partitions follow, parse them */
- if ((parts = newpart(s + 1, &s, num_parts,
- this_part + 1, &extra_mem, extra_mem_size)) == 0)
- return NULL;
+ parts = newpart(s + 1, &s, num_parts, this_part + 1,
+ &extra_mem, extra_mem_size);
+ if (!parts)
+ return NULL;
}
else
{ /* this is the last partition: allocate space for all */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Sergei Shtylyov]

Hello.

Adrian Bunk wrote:

> Sparse spotted that 0 was compared to pointers.

> While I was at it, I also moved the assignments out of the if's.

> Signed-off-by: Adrian Bunk <bu...@kernel.org>

> 32de76e83f37322dd85eaecf126e7b17327f606f diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c

> index b44292a..3e09043 100644
> --- a/drivers/mtd/cmdlinepart.c
> +++ b/drivers/mtd/cmdlinepart.c
> @@ -119,7 +119,8 @@ static struct mtd_partition * newpart(char *s,
> char *p;
>
> name = ++s;
> - if ((p = strchr(name, delim)) == 0)
> + p = strchr(name, delim);
> + if (!p)
> {

Wouldn't it be nice to join the standalone brace to if () while it?

> printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
> return NULL;

WBR, Sergei

[Adrian Bunk]

On Mon, Apr 14, 2008 at 06:42:11PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> Adrian Bunk wrote:
>
>> Sparse spotted that 0 was compared to pointers.
>
>> While I was at it, I also moved the assignments out of the if's.
>
>> Signed-off-by: Adrian Bunk <bu...@kernel.org>
>
>> 32de76e83f37322dd85eaecf126e7b17327f606f diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
>> index b44292a..3e09043 100644
>> --- a/drivers/mtd/cmdlinepart.c
>> +++ b/drivers/mtd/cmdlinepart.c
>> @@ -119,7 +119,8 @@ static struct mtd_partition * newpart(char *s,
>> char *p;
>> name = ++s;
>> - if ((p = strchr(name, delim)) == 0)
>> + p = strchr(name, delim);
>> + if (!p)
>> {
>
> Wouldn't it be nice to join the standalone brace to if () while it?

Most of the file is written like this, so there's no point in changing
it only here...

>> printk(KERN_ERR ERRP "no closing %c found in partition name\n", delim);
>> return NULL;
>
> WBR, Sergei

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed