Skip to contentSkip to conversation

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

PATCH In review Domen Puncer 3 participants 3 messages Jun 4, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wireless: char* -> char[] conversion in airo.c

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
drivers/net/wireless/airo.c +1 -1
diff -pruNX dontdiff c/drivers/net/wireless/airo.c a/drivers/net/wireless/airo.c
@@ -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

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

drivers/net/wireless/airo.c typedef struct aironet_ioctl { · line 903

Quoted 11 lines · Domen Puncer

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
drivers/net/wireless/airo.c +1 -0
 
+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
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw
In reply to Domen Puncer

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

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors