[KJ] Re: [PATCH] drivers/char: Use ARRAY_SIZE macro

[KJ] Re: [PATCH] drivers/char: Use ARRAY_SIZE macro

[Andrew Morton]

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

Tobias Klauser <tklauser@nuerscht.ch> wrote:
>
> @@ -913,15 +913,10 @@ static int stl_parsebrd(stlconf_t *confp
>  	for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++)
>  		*sp = TOLOWER(*sp);
>  
> -	nrbrdnames = sizeof(stl_brdstr) / sizeof(stlbrdtype_t);
> -	for (i = 0; (i < nrbrdnames); i++) {
> +	for (i = 0; i < ARRAY_SIZE(stl_brdstr); i++) {
>  		if (strcmp(stl_brdstr[i].name, argp[0]) == 0)
>  			break;
>  	}
> -	if (i >= nrbrdnames) {
> -		printk("STALLION: unknown board name, %s?\n", argp[0]);
> -		return(0);
> -	}
>  
>  	confp->brdtype = stl_brdstr[i].type;

The second change here in stallion.c seems wrong.

I replaced it with

	if (i == ARRAY_SIZE(stl_brdstr)) {
		printk("STALLION: unknown board name, %s?\n", argp[0]);
		return 0;
	}


[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] Re: [PATCH] drivers/char: Use ARRAY_SIZE macro

[Andrew Morton]

[-- Attachment #1: Type: text/plain, Size: 722 bytes --]

Tobias Klauser <tklauser@nuerscht.ch> wrote:
>
> @@ -979,15 +977,10 @@ static int stli_parsebrd(stlconf_t *conf
>  	for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++)
>  		*sp = TOLOWER(*sp);
>  
> -	nrbrdnames = sizeof(stli_brdstr) / sizeof(stlibrdtype_t);
> -	for (i = 0; (i < nrbrdnames); i++) {
> +	for (i = 0; i < ARRAY_SIZE(stli_brdstr); i++) {
>  		if (strcmp(stli_brdstr[i].name, argp[0]) == 0)
>  			break;
>  	}
> -	if (i >= nrbrdnames) {
> -		printk("STALLION: unknown board name, %s?\n", argp[0]);
> -		return(0);
> -	}
>  
>  	confp->brdtype = stli_brdstr[i].type;

Same problem here.

	if (i == ARRAY_SIZE(stli_brdstr)) {
		printk("STALLION: unknown board name, %s?\n", argp[0]);
		return 0;
	}


[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] Re: [PATCH] drivers/char: Use ARRAY_SIZE macro

[Tobias Klauser]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

On 2005-11-18 at 00:12:43 +0100, Andrew Morton <akpm@osdl.org> wrote:
> The second change here in stallion.c seems wrong.
> 
> I replaced it with
> 
> 	if (i == ARRAY_SIZE(stl_brdstr)) {
> 		printk("STALLION: unknown board name, %s?\n", argp[0]);
> 		return 0;
> 	}

Oh sure! Don't know what hit me there. :-/ Thanks for correcting.

[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] Re: [PATCH] drivers/char: Use ARRAY_SIZE macro

[Christophe Lucas]

[-- Attachment #1: Type: text/plain, Size: 961 bytes --]

Andrew Morton (akpm@osdl.org) wrote:
> Tobias Klauser <tklauser@nuerscht.ch> wrote:
> >
> > @@ -913,15 +913,10 @@ static int stl_parsebrd(stlconf_t *confp
> >  	for (sp = argp[0], i = 0; ((*sp != 0) && (i < 25)); sp++, i++)
> >  		*sp = TOLOWER(*sp);
> >  
> > -	nrbrdnames = sizeof(stl_brdstr) / sizeof(stlbrdtype_t);
> > -	for (i = 0; (i < nrbrdnames); i++) {
> > +	for (i = 0; i < ARRAY_SIZE(stl_brdstr); i++) {
> >  		if (strcmp(stl_brdstr[i].name, argp[0]) == 0)
> >  			break;
> >  	}
> > -	if (i >= nrbrdnames) {
> > -		printk("STALLION: unknown board name, %s?\n", argp[0]);
> > -		return(0);
> > -	}
> >  
> >  	confp->brdtype = stl_brdstr[i].type;
> 
> The second change here in stallion.c seems wrong.
> 
> I replaced it with
> 
> 	if (i == ARRAY_SIZE(stl_brdstr)) {
> 		printk("STALLION: unknown board name, %s?\n", argp[0]);
> 		return 0;
> 	}
 
Should correct KERN_* constant be used here in printk(); ? 

				- Christophe (clucas@rotomalug.org)


[-- Attachment #2: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors