[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-wlan-devel
Subject:    Re: [lwlan-devel] [PATCH] More warning fixes
From:       Pavel Roskin <proski () gnu ! org>
Date:       2005-01-25 21:38:33
Message-ID: Pine.LNX.4.62.0501251634310.27939 () localhost ! localdomain
[Download RAW message or body]

Hi!

Sorry, please disregard the previous patch.  I didn't notice that the 
format warnings would appear on ARM (and presumably on other 32-bit 
architectures) after I fix them on AMD64.  The new patch uses an explicit 
cast to long int.  Maybe it's not pretty, but it's effective.  Really 
compile tested this time.

-- 
Regards,
Pavel Roskin

["warnings1.diff" (TEXT/PLAIN)]

Index: src/include/wlan/p80211meta.h
===================================================================
--- src/include/wlan/p80211meta.h	(revision 1673)
+++ src/include/wlan/p80211meta.h	(working copy)
@@ -154,10 +154,10 @@
 UINT32 p80211_text2catdid(catlistitem_t *list, char *name );
 UINT32 p80211_text2grpdid(grplistitem_t *list, char *name );
 UINT32 p80211_text2itemdid(p80211meta_t *list, char *name );
-INT p80211_isvalid_did( catlistitem_t *catlist, UINT32 did );
-INT p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did );
-INT p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did );
-INT p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did );
+UINT32 p80211_isvalid_did( catlistitem_t *catlist, UINT32 did );
+UINT32 p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did );
+UINT32 p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did );
+UINT32 p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did );
 catlistitem_t *p80211_did2cat( catlistitem_t *catlist, UINT32 did );
 grplistitem_t *p80211_did2grp( catlistitem_t *catlist, UINT32 did );
 p80211meta_t *p80211_did2item( catlistitem_t *catlist, UINT32 did );
Index: src/wlanctl/wlanctl.c
===================================================================
--- src/wlanctl/wlanctl.c	(revision 1673)
+++ src/wlanctl/wlanctl.c	(working copy)
@@ -346,7 +346,7 @@
 				(short)P80211ENUM_msgitem_status_no_value;
 			if ( (((p80211item_t *)msgptr)->len =
 				(short)(p80211item_maxdatalen(msg_catlist,
-					tmpdid))) != 0xffffffffUL ) {
+					tmpdid))) != 0xffff ) {
 				((p80211msg_t *)msg)->msglen +=
 					( sizeof(p80211item_t) + 
 					((p80211item_t *)msgptr)->len );
Index: src/shared/p80211meta.c
===================================================================
--- src/shared/p80211meta.c	(revision 1673)
+++ src/shared/p80211meta.c	(working copy)
@@ -328,7 +328,7 @@
 *	P80211DID_INVALID	if DID is an invalid DID
 *	!P80211DID_INVALID	if DID is a valid DID
 ----------------------------------------------------------------*/
-INT p80211_isvalid_did( catlistitem_t *catlist, UINT32 did )
+UINT32 p80211_isvalid_did( catlistitem_t *catlist, UINT32 did )
 {
 	int		result;
 
@@ -351,7 +351,7 @@
 *	P80211DID_INVALID	if DID is an invalid DID
 *	!P80211DID_INVALID	if DID is a valid DID
 ----------------------------------------------------------------*/
-INT p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did )
+UINT32 p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did )
 {
 	int		result;
 	int		cat;
@@ -383,7 +383,7 @@
 *	P80211DID_INVALID	if DID is an invalid DID
 *	!P80211DID_INVALID	if DID is a valid DID
 ----------------------------------------------------------------*/
-INT p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did )
+UINT32 p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did )
 {
 	int		result;
 	int		cat;
@@ -418,7 +418,7 @@
 *	P80211DID_INVALID	if DID is an invalid DID
 *	!P80211DID_INVALID	if DID is a valid DID
 ----------------------------------------------------------------*/
-INT p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did )
+UINT32 p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did )
 {
 	int		result;
 	int		cat;
Index: src/p80211/p80211frm.c
===================================================================
--- src/p80211/p80211frm.c	(revision 1673)
+++ src/p80211/p80211frm.c	(working copy)
@@ -1046,8 +1046,8 @@
                         break;
                 default:
                         WLAN_LOG_WARNING(
-                                "Bad EID=%dd in proberesp, off=%d .\n",
-                                ie_ptr->eid, f->buf - (UINT8*)ie_ptr);
+                                "Bad EID=%dd in proberesp, off=%ld .\n",
+                                ie_ptr->eid, (long int) (f->buf - (UINT8*)ie_ptr));
                         WLAN_HEX_DUMP(3, "frm w/ bad eid:", f->buf, f->len );
                         break;
                 }
Index: src/p80211/p80211conv.c
===================================================================
--- src/p80211/p80211conv.c	(revision 1673)
+++ src/p80211/p80211conv.c	(working copy)
@@ -442,8 +442,9 @@
 		    > netdev->mtu) {
 			/* A bogus length ethfrm has been sent. */
 			/* Is someone trying an oflow attack? */
-			WLAN_LOG_ERROR("DIXII frame too large (%d > %d)\n",
-					payload_length - sizeof(wlan_llc_t) - sizeof(wlan_snap_t),
+			WLAN_LOG_ERROR("DIXII frame too large (%ld > %d)\n",
+					(long int) (payload_length - sizeof(wlan_llc_t) - 
+						    sizeof(wlan_snap_t)),
 					netdev->mtu);
 			return 1;
 		}
Index: src/prism2/driver/prism2_plx.c
===================================================================
--- src/prism2/driver/prism2_plx.c	(revision 1673)
+++ src/prism2/driver/prism2_plx.c	(working copy)
@@ -418,6 +418,7 @@
 
 static int __init prism2plx_init(void)
 {
+        WLAN_LOG_NOTICE("%s Loaded\n", version);
 	return pci_module_init(&prism2_plx_drv_id);
 };
 
Index: src/prism2/driver/prism2_pci.c
===================================================================
--- src/prism2/driver/prism2_pci.c	(revision 1673)
+++ src/prism2/driver/prism2_pci.c	(working copy)
@@ -274,6 +274,7 @@
 
 static int __init prism2pci_init(void)
 {
+        WLAN_LOG_NOTICE("%s Loaded\n", version);
 	return pci_module_init(&prism2_pci_drv_id);
 };
 


_______________________________________________
Linux-wlan-devel mailing list
Linux-wlan-devel@lists.linux-wlan.com
http://lists.linux-wlan.com/mailman/listinfo/linux-wlan-devel


[prev in list] [next in list] [prev in thread] [next in thread]