Align with parentheses and clean if tests
v5 cover Align with parentheses and clean if tests
Align the print statements with the
open parentheses and
put logical operands on the previous line
Sreya Mittal (2):
staging: speakup: Align with parentheses
staging: speakup: Clean up if conditions
drivers/staging/speakup/keyhelp.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
Signature · 1 line
2.9.3
PATCH v5 1/2 staging: speakup: Align with parentheses
Align next line of print statements
to the right of open parentheses.
Signed-off-by Sreya Mittal <[email protected]>
---
Changes in v5:
*Add the removed parentheses back
drivers/staging/speakup/keyhelp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/speakup/keyhelp.c +2 -2
@@ -117,7 +117,7 @@ static void say_key(int key) }if ((key >0 ) && (key <= num_key_names))synth_printf (" %s\n" , -spk_msg_get (MSG_KEYNAMES_START + (key -1 ))); +spk_msg_get (MSG_KEYNAMES_START + (key -1 ))); }static int help_init (void )
@@ -182,7 +182,7 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key) name =NULL ;if ((type !=KT_SPKUP ) && (key >0 ) && (key <= num_key_names)) {synth_printf ("%s\n" , -spk_msg_get (MSG_KEYNAMES_START + key -1 )); +spk_msg_get (MSG_KEYNAMES_START + key -1 ));return 1 ; }for (i =0 ; funcvals[i] !=0 && !name; i++) {
Signature · 1 line
2.9.3
PATCH v5 2/2 staging: speakup: Clean up if conditions
In reply to Sreya MittalFound 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
* Line up the tests
Signed-off-by Sreya Mittal <[email protected]>
---
Changes in v5:
No change in this patch.
drivers/staging/speakup/keyhelp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/speakup/keyhelp.c +4 -6
@@ -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