staging: lustre: align else if statement to coding standard
v4 cover staging: lustre: align else if statement to coding standard
Align else if statement to normal kernel style
Maksymilian Piechota (2):
staging: lustre: move logical continuations at the end of line
staging: lustre: move else if statement to a single line
drivers/staging/wlan-ng/prism2mgmt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Signature · 1 line
2.1.4
PATCH v4 1/2 staging: lustre: move logical continuations at the end of line
--- drivers/staging/wlan-ng/prism2mgmt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/prism2mgmt.c +2 -3
@@ -1308,9 +1308,8 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp) hw->sniffhdr =0 ; wlandev->netdev->type =ARPHRD_IEEE80211_PRISM ; }else -if ((msg->wlanheader.status == - P80211ENUM_msgitem_status_data_ok) - && (msg->wlanheader.data == P80211ENUM_truth_true)) { +if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && + (msg->wlanheader.data == P80211ENUM_truth_true)) { hw->sniffhdr =1 ; wlandev->netdev->type =ARPHRD_IEEE80211_PRISM ; }else {
Signature · 1 line
2.1.4
PATCH v4 2/2 staging: lustre: move else if statement to a single line
In reply to Maksymilian Piechota--- drivers/staging/wlan-ng/prism2mgmt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/wlan-ng/prism2mgmt.c +1 -2
@@ -1307,8 +1307,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp) && (msg->prismheader.data == P80211ENUM_truth_true)) { hw->sniffhdr =0 ; wlandev->netdev->type =ARPHRD_IEEE80211_PRISM ; - } else - if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && + } else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && (msg->wlanheader.data == P80211ENUM_truth_true)) { hw->sniffhdr =1 ; wlandev->netdev->type =ARPHRD_IEEE80211_PRISM ;
Signature · 1 line
2.1.4
Re: [PATCH v4 2/2] staging: lustre: move else if statement to a single line
drivers/staging/wlan-ng/prism2mgmt.c
Quoted 1 line · Maksymilian Piechota
drivers/staging/wlan-ng/prism2mgmt.c +0
-0
[]
drivers/staging/wlan-ng/prism2mgmt.c int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp) · line 1313
Quoted 10 lines
drivers/staging/wlan-ng/prism2mgmt.c +1
-2@@ -1307,8 +1307,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp) && (msg->prismheader.data == P80211ENUM_truth_true)) { hw->sniffhdr =0 ; wlandev->netdev->type =ARPHRD_IEEE80211_PRISM ; - } else - if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && + } else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) && (msg->wlanheader.data == P80211ENUM_truth_true)) { hw->sniffhdr =1 ; wlandev->netdev->type =ARPHRD_IEEE80211_PRISM ;
Hi again.
When you change the else if on multiple lines to a single line, you should also realign the continuation like:
} else if ((msg->wlanheader.status == P80211ENUM_msgitem_status_data_ok) &&
(msg->wlanheader.data == P80211ENUM_truth_true)) {Using 3 tabs then 3 spaces
Quoted 6 lines
Align else if statement to normal kernel style
Maksymilian Piechota (2):
staging: lustre: move logical continuations at the end of line
staging: lustre: move else if statement to a single line
Its not lustre :-)
Quoted 11 lines
drivers/staging/wlan-ng/prism2mgmt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)Signature · 6 lines
2.1.4 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel