Skip to contentSkip to conversation

staging: speakup: Clean up if conditions

PATCH In review Sreya Mittal 2 participants 2 messages Feb 28, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v4 2/2 staging: speakup: Clean up if conditions

Found by checkpatch.pl
Logical conditions are on the next line, useless parentheses present Clean up the if tests by

* Put logical conditions on the previous line
* Remove useless parentheses
* Line up the tests

---

No changes in v4

Changes in v3:
*Correct placement of patch changes

Changes in v2:
* More elaborate log message
* Fit MSG_FUNCNAMES_END) on the previous line
* Fit ch == SPEAKUP_HELP && on the previous line

 drivers/staging/speakup/keyhelp.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/speakup/keyhelp.c +4 -6
index c373762..4d00bc2 100644
@@ -163,17 +163,15 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
 		}
 		cur_item = letter_offsets[ch - 'a'];
 	} else if (type == KT_CUR) {
-		if (ch == 0
-		    && MSG_FUNCNAMES_START + cur_item + 1 <=
-		    MSG_FUNCNAMES_END)
+		if (ch == 0 &&
+		    MSG_FUNCNAMES_START + cur_item + 1 <= MSG_FUNCNAMES_END)
 			cur_item++;
 		else if (ch == 3 && cur_item > 0)
 			cur_item--;
 		else
 			return -1;
-	} else if (type == KT_SPKUP
-			&& ch == SPEAKUP_HELP
-			&& !spk_special_handler) {
+	} else if (type == KT_SPKUP && ch == SPEAKUP_HELP &&
+		   !spk_special_handler) {
 		spk_special_handler = spk_handle_help;
 		synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));
 		build_key_data(); /* rebuild each time in case new mapping */
Signature · 1 line
2.9.3
#1 lore raw
Quoted 30 lines · Sreya Mittal

Found by checkpatch.pl
Logical conditions are on the next line, useless parentheses present Clean up the if tests by

* Put logical conditions on the previous line
* Remove useless parentheses
* Line up the tests

---

No changes in v4

Changes in v3:
*Correct placement of patch changes

Changes in v2:
* More elaborate log message
* Fit MSG_FUNCNAMES_END) on the previous line
* Fit ch == SPEAKUP_HELP && on the previous line

 drivers/staging/speakup/keyhelp.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/speakup/keyhelp.c +0 -0
index c373762..4d00bc2 100644

drivers/staging/speakup/keyhelp.c int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key) · line 167

Quoted 8 lines
drivers/staging/speakup/keyhelp.c +2 -3
@@ -163,17 +163,15 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
 		}
 		cur_item = letter_offsets[ch - 'a'];
 	} else if (type == KT_CUR) {
-		if (ch == 0
-		    && MSG_FUNCNAMES_START + cur_item + 1 <=
-		    MSG_FUNCNAMES_END)
+		if (ch == 0 &&
+		    MSG_FUNCNAMES_START + cur_item + 1 <= MSG_FUNCNAMES_END)

Ah, now you fix up the lines. But really, keep the extra (), they make things much more readable and ensure that someone didn't get the precedence order of operations incorrect.

thanks,

greg k-h