[KJ] [patch] wireless: char* -> char[] conversion in airo.c

[KJ] [patch] wireless: char* -> char[] conversion in airo.c

[Domen Puncer]

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

This conversion makes code from line 7101 right:
	if (copy_to_user(com.data, swversion, sizeof(swversion)))

size output (before, after):
  55416    2228     160   57804    e1cc drivers/net/wireless/airo.o
  55412    2228     160   57800    e1c8 drivers/net/wireless/airo.o


Signed-off-by: Domen Puncer <domen@coderock.org>

diff -pruNX dontdiff c/drivers/net/wireless/airo.c a/drivers/net/wireless/airo.c
--- c/drivers/net/wireless/airo.c	2005-05-25 13:34:49.000000000 +0200
+++ a/drivers/net/wireless/airo.c	2005-06-04 15:49:10.000000000 +0200
@@ -900,7 +900,7 @@ typedef struct aironet_ioctl {
 	unsigned char __user *data;	// d-data
 } aironet_ioctl;
 
-static char *swversion = "2.1";
+static char swversion[] = "2.1";
 #endif /* CISCO_EXT */
 
 #define NUM_MODULES       2

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

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

Re: [KJ] [patch] wireless: char* -> char[] conversion in airo.c

[Alexey Dobriyan]

On Saturday 04 June 2005 19:06, Domen Puncer wrote:
> This conversion makes code from line 7101 right:
> 	if (copy_to_user(com.data, swversion, sizeof(swversion)))
> 
> size output (before, after):
>   55416    2228     160   57804    e1cc drivers/net/wireless/airo.o
>   55412    2228     160   57800    e1c8 drivers/net/wireless/airo.o

> --- c/drivers/net/wireless/airo.c
> +++ a/drivers/net/wireless/airo.c

> +static char swversion[] = "2.1";

Looks good.

2.95.3:
	   text	   data	    bss	    dec	    hex	filename
before	  51118	   2156	    160	  53434	   d0ba	drivers/net/wireless/airo.o
after	  51118	   2156	    160	  53434	   d0ba	drivers/net/wireless/airo.o

You won't fool him. :-)

3.3.5-20050130:
before	  46999	   2156	    160	  49315	   c0a3	drivers/net/wireless/airo.o
after	  46994	   2156	    160	  49310	   c09e	drivers/net/wireless/airo.o

4.1.0-20050522:
before	  45555	   2220	    160	  47935	   bb3f	drivers/net/wireless/airo.o
after	  45550	   2220	    160	  47930	   bb3a	drivers/net/wireless/airo.o
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [patch] wireless: char* -> char[] conversion in airo.c

[randy_dunlap]

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

On Sat, 4 Jun 2005 20:05:33 +0400 Alexey Dobriyan wrote:

| 2.95.3:
| 	   text	   data	    bss	    dec	    hex	filename
| before	  51118	   2156	    160	  53434	   d0ba	drivers/net/wireless/airo.o
| after	  51118	   2156	    160	  53434	   d0ba	drivers/net/wireless/airo.o
| 
| You won't fool him. :-)
| 
| 3.3.5-20050130:
| before	  46999	   2156	    160	  49315	   c0a3	drivers/net/wireless/airo.o
| after	  46994	   2156	    160	  49310	   c09e	drivers/net/wireless/airo.o
| 
| 4.1.0-20050522:
| before	  45555	   2220	    160	  47935	   bb3f	drivers/net/wireless/airo.o
| after	  45550	   2220	    160	  47930	   bb3a	drivers/net/wireless/airo.o


Alexey,

For those of us who don't routinely have multiple gcc versions
available, is there any trick to doing that?  Could give a small
explanation?

Thanks,
---
~Randy

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

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