File kmp-04-types.diff of Package wanpipe

Overview Repositories Revisions Requests Users Attributes Meta

File kmp-04-types.diff of Package wanpipe (Revision 55f0934bb0c3b154f4215e9e1f22a91e)

Currently displaying revision 55f0934bb0c3b154f4215e9e1f22a91e , Show latest

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-17 16:15:58.788538325 +0200
Upstream: tbd

Fix a slew of errors (just quickly, paying no attention to kernels before 2.6.34):

Properly use const char *:
sdladrv_src.c:4339:7: warning: passing argument 6 of 'sdla_hwcpu_search' discards qualifiers from pointer target type
sdladrv_src.c:346:15: note: expected 'char *' but argument is of type 'const char *'

Use uintptr_t:
sdladrv_src.c:5629:32: warning: cast from pointer to integer of different size

const char *:
sdladrv_src.c:11095:2: warning: passing argument 5 of 'sdla_card_search' discards qualifiers from pointer target type
sdladrv_src.c:4260:1: note: expected 'char *' but argument is of type 'const char *'
sdladrv_src.c:11097:3: warning: passing argument 5 of 'sdla_card_register' discards qualifiers from pointer target type
sdladrv_src.c:4192:1: note: expected 'char *' but argument is of type 'const char *'
sdladrv_src.c: In function 'sdla_usb_remove':
sdladrv_src.c:11137:2: warning: passing argument 5 of 'sdla_card_search' discards qualifiers from pointer target type
sdladrv_src.c:4260:1: note: expected 'char *' but argument is of type 'const char *'
---
 patches/kdrivers/src/wanrouter/wanproc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: wanpipe-3.5.27/patches/kdrivers/src/wanrouter/wanproc.c
===================================================================
--- wanpipe-3.5.27.orig/patches/kdrivers/src/wanrouter/wanproc.c
+++ wanpipe-3.5.27/patches/kdrivers/src/wanrouter/wanproc.c
@@ -1578,7 +1578,7 @@ int wanrouter_proc_add_protocol(wan_devi
 		p->nlink = 1;
 		p->get_info 	= get_dev_config_info;
 #endif
-		p->data 	= (void*)wandev->config_id;
+		p->data 	= (void *)(uintptr_t)wandev->config_id;
 	
 		/* Create /proc/net/wanrouter/<protocol>/status directory */
 		p = create_proc_entry("status",0,proc_protocol->protocol_entry);
@@ -1597,7 +1597,7 @@ int wanrouter_proc_add_protocol(wan_devi
 		p->nlink = 1;
 		p->get_info 	= get_dev_status_info;
 #endif
-		p->data 	= (void*)wandev->config_id;
+		p->data 	= (void *)(uintptr_t)wandev->config_id;
 	}	
 	
 	/* Create /proc/net/wanrouter/<protocol>/<wanpipe#> directory */

Places

File kmp-04-types.diff of Package wanpipe (Revision 55f0934bb0c3b154f4215e9e1f22a91e)

Places