staging: rtl8188eu: Simplify memcmp logical checks
PATCH 1/1 staging: rtl8188eu: Simplify memcmp logical checks
Clang generates a warning when it sees a logical not followed by a conditional operator like ==, >, or < because it thinks that the logical not should be applied to the whole statement:
drivers/staging/rtl8188eu/core/rtw_ieee80211.c:293:8: warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]
It assumes the author might have made a mistake in their logic:
if (!a == b) -> if (!(a == b))
Sometimes that is the case; other times, it's just a super convoluted way of saying 'if (a)' when b = 0:
if (!1 == 0) -> if (0 == 0) -> if (true)
Alternatively:
if (!1 == 0) -> if (!!1) -> if (1)
Simplify these comparisons so that Clang doesn't complain.
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +1 -1
@@ -284,7 +284,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit)if (pbuf) {/* check if oui matches... */ -if (!memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type)) == false) +if (memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type))) goto check_next_ie;/* check version... */
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -1
@@ -1437,7 +1437,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv/* check ssid, if needed */ if (pmlmepriv->assoc_ssid.SsidLength) {if (competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength || - !memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == false) +memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength)) goto exit; }
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -1283,8 +1283,8 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe) psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE ;/* convert hdr + possible LLC headers into Ethernet header */ if ((!memcmp (psnap, rtw_rfc1042_header,SNAP_SIZE ) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) == false) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 ) == false)) || +memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) && +memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 )) || !memcmp (psnap, rtw_bridge_tunnel_header,SNAP_SIZE )) {/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ bsnaphdr = true;
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1 -1
@@ -856,7 +856,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)return _FAIL; } -if (!memcmp (cur_network->network.MacAddress, pbssid,6 ) == false) { + if (memcmp(cur_network->network.MacAddress, pbssid, 6) {DBG_88E ("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n%pM %pM\n" , (pbssid), (cur_network->network.MacAddress));return true;
Signature · 1 line
2.19.0
Greg Kroah-Hartman
maintainerQuoted 78 lines · Nathan Chancellor
Clang generates a warning when it sees a logical not followed by a conditional operator like ==, >, or < because it thinks that the logical not should be applied to the whole statement:
drivers/staging/rtl8188eu/core/rtw_ieee80211.c:293:8: warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]It assumes the author might have made a mistake in their logic:
if (!a == b) -> if (!(a == b))
Sometimes that is the case; other times, it's just a super convoluted way of saying 'if (a)' when b = 0:
if (!1 == 0) -> if (0 == 0) -> if (true)
Alternatively:
if (!1 == 0) -> if (!!1) -> if (1)
Simplify these comparisons so that Clang doesn't complain.
Signed-off-by Nathan Chancellor <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)drivers/staging/rtl8188eu/core/rtw_ieee80211.c +1
-1@@ -284,7 +284,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit)if (pbuf) {/* check if oui matches... */ -if (!memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type)) == false) +if (memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type))) goto check_next_ie;/* check version... */ drivers/staging/rtl8188eu/core/rtw_mlme.c +1
-1@@ -1437,7 +1437,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv/* check ssid, if needed */ if (pmlmepriv->assoc_ssid.SsidLength) {if (competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength || - !memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == false) +memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength)) goto exit; }drivers/staging/rtl8188eu/core/rtw_recv.c +2
-2@@ -1283,8 +1283,8 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe) psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE ;/* convert hdr + possible LLC headers into Ethernet header */ if ((!memcmp (psnap, rtw_rfc1042_header,SNAP_SIZE ) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) == false) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 ) == false)) || +memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) && +memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 )) || !memcmp (psnap, rtw_bridge_tunnel_header,SNAP_SIZE )) {/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ bsnaphdr = true;drivers/staging/rtl8188eu/core/rtw_wlan_util.c +0
-0
drivers/staging/rtl8188eu/core/rtw_wlan_util.c int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) · line 862
Quoted 8 lines
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1
-1@@ -856,7 +856,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)return _FAIL; } -if (!memcmp (cur_network->network.MacAddress, pbssid,6 ) == false) { + if (memcmp(cur_network->network.MacAddress, pbssid, 6) {DBG_88E ("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n%pM %pM\n" , (pbssid), (cur_network->network.MacAddress));return true;
Always test-build your patches before sending them off so you do not get a grumpy maintainer upset at you for breaking their build system...
Hint, it's the last chunk here...
greg k-h
Quoted 91 lines · Greg Kroah-Hartman
Quoted 78 lines · Nathan Chancellor
Clang generates a warning when it sees a logical not followed by a conditional operator like ==, >, or < because it thinks that the logical not should be applied to the whole statement:
drivers/staging/rtl8188eu/core/rtw_ieee80211.c:293:8: warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]It assumes the author might have made a mistake in their logic:
if (!a == b) -> if (!(a == b))
Sometimes that is the case; other times, it's just a super convoluted way of saying 'if (a)' when b = 0:
if (!1 == 0) -> if (0 == 0) -> if (true)
Alternatively:
if (!1 == 0) -> if (!!1) -> if (1)
Simplify these comparisons so that Clang doesn't complain.
Signed-off-by Nathan Chancellor <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)drivers/staging/rtl8188eu/core/rtw_ieee80211.c +1
-1@@ -284,7 +284,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit)if (pbuf) {/* check if oui matches... */ -if (!memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type)) == false) +if (memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type))) goto check_next_ie;/* check version... */ drivers/staging/rtl8188eu/core/rtw_mlme.c +1
-1@@ -1437,7 +1437,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv/* check ssid, if needed */ if (pmlmepriv->assoc_ssid.SsidLength) {if (competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength || - !memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == false) +memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength)) goto exit; }drivers/staging/rtl8188eu/core/rtw_recv.c +2
-2@@ -1283,8 +1283,8 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe) psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE ;/* convert hdr + possible LLC headers into Ethernet header */ if ((!memcmp (psnap, rtw_rfc1042_header,SNAP_SIZE ) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) == false) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 ) == false)) || +memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) && +memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 )) || !memcmp (psnap, rtw_bridge_tunnel_header,SNAP_SIZE )) {/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ bsnaphdr = true;drivers/staging/rtl8188eu/core/rtw_wlan_util.c +0
-0drivers/staging/rtl8188eu/core/rtw_wlan_util.c int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) · line 862
Quoted 8 lines
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1
-1@@ -856,7 +856,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)return _FAIL; } -if (!memcmp (cur_network->network.MacAddress, pbssid,6 ) == false) { + if (memcmp(cur_network->network.MacAddress, pbssid, 6) {DBG_88E ("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n%pM %pM\n" , (pbssid), (cur_network->network.MacAddress));return true;Always test-build your patches before sending them off so you do not get a grumpy maintainer upset at you for breaking their build system...
Quoted 3 lines
Hint, it's the last chunk here...
greg k-h
Gah sorry, it's always the times that I don't do that that something bad happens :(
v2 sent.
Nathan
PATCH v2 1/1 staging: rtl8188eu: Simplify memcmp logical checks
In reply to Nathan ChancellorClang generates a warning when it sees a logical not followed by a conditional operator like ==, >, or < because it thinks that the logical not should be applied to the whole statement:
drivers/staging/rtl8188eu/core/rtw_ieee80211.c:293:8: warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]
It assumes the author might have made a mistake in their logic:
if (!a == b) -> if (!(a == b))
Sometimes that is the case; other times, it's just a super convoluted way of saying 'if (a)' when b = 0:
if (!1 == 0) -> if (0 == 0) -> if (true)
Alternatively:
if (!1 == 0) -> if (!!1) -> if (1)
Simplify these comparisons so that Clang doesn't complain.
---
v1 -> v2:
* Fix missing parenthesis in last hunk
drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +1 -1
@@ -284,7 +284,7 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, uint *wpa_ie_len, int limit)if (pbuf) {/* check if oui matches... */ -if (!memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type)) == false) +if (memcmp ((pbuf +2 ), wpa_oui_type,sizeof (wpa_oui_type))) goto check_next_ie;/* check version... */
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -1
@@ -1437,7 +1437,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv/* check ssid, if needed */ if (pmlmepriv->assoc_ssid.SsidLength) {if (competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength || - !memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == false) +memcmp (competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength)) goto exit; }
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -1283,8 +1283,8 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe) psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE ;/* convert hdr + possible LLC headers into Ethernet header */ if ((!memcmp (psnap, rtw_rfc1042_header,SNAP_SIZE ) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) == false) && - (!memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 ) == false)) || +memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 ) && +memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 )) || !memcmp (psnap, rtw_bridge_tunnel_header,SNAP_SIZE )) {/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */ bsnaphdr = true;
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1 -1
@@ -856,7 +856,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)return _FAIL; } -if (!memcmp (cur_network->network.MacAddress, pbssid,6 ) == false) { +if (memcmp (cur_network->network.MacAddress, pbssid,6 )) {DBG_88E ("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n%pM %pM\n" , (pbssid), (cur_network->network.MacAddress));return true;
Signature · 1 line
2.19.0