staging:speakup:main.c Operators to end of line
PATCH 3/3 staging:speakup:main.c Operators to end of line
Made suggested modifications from checkpatch in reference to CHECK: Alignment should match open parenthesis
additionally moved operators to end of line
Signed-off-by Walt Feasel <[email protected]>
--- drivers/staging/speakup/main.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/staging/speakup/main.c +18 -22
@@ -564,18 +564,17 @@ static u_long get_word(struct vc_data *vc) *buf ='\0' ;synth_printf ("%s\n" ,spk_msg_get (MSG_SPACE ));return 0 ; - }else if ((tmpx < vc->vc_cols -2 ) - && (ch ==SPACE || ch ==0 ||IS_WDLM (ch)) - && ((char )get_char (vc, (u_short *)&tmp_pos +1 , &temp) > -SPACE )) { + }else if ((tmpx < vc->vc_cols -2 ) && (ch ==SPACE || ch ==0 || +IS_WDLM (ch)) && ((char )get_char (vc, (u_short *)&tmp_pos +1 , + &temp) >SPACE )) { tmp_pos +=2 ; tmpx++; }else while (tmpx >0 ) { ch = (char )get_char (vc, (u_short *)tmp_pos -1 , &temp); -if ((ch ==SPACE || ch ==0 ||IS_WDLM (ch)) - && ((char )get_char (vc, (u_short *)tmp_pos, &temp) > -SPACE )) +if ((ch ==SPACE || ch ==0 ||IS_WDLM (ch)) && + ((char )get_char (vc, (u_short *)tmp_pos, &temp) > +SPACE ))break ; tmp_pos -=2 ; tmpx--;
@@ -586,8 +585,8 @@ static u_long get_word(struct vc_data *vc) tmp_pos +=2 ; tmpx++; ch = (char )get_char (vc, (u_short *)tmp_pos, &temp); -if ((ch ==SPACE ) || ch ==0 - || (IS_WDLM (buf[cnt -1 ]) && (ch >SPACE ))) +if ((ch ==SPACE ) || ch ==0 || (IS_WDLM (buf[cnt -1 ]) && + (ch >SPACE )))break ; buf[cnt++] = ch; }
@@ -725,8 +724,8 @@ static void spell_word(struct vc_data *vc)synth_printf ("%s" , str_cap); last_cap = str_cap; } -if (this_speakup_key ==SPELL_PHONETIC - && (isascii (ch) &&isalpha (ch))) { +if (this_speakup_key ==SPELL_PHONETIC && + (isascii (ch) &&isalpha (ch))) { ch &=31 ; cp1 = phonetic[--ch]; }else {
@@ -895,8 +894,8 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)while (start < end) { sentbuf[bn][i] = (char )get_char (vc, (u_short *)start, &tmp);if (i >0 ) { -if (sentbuf[bn][i] ==SPACE && sentbuf[bn][i -1 ] =='.' - && numsentences[bn] <9 ) { +if (sentbuf[bn][i] ==SPACE && + sentbuf[bn][i -1 ] =='.' && numsentences[bn] <9 ) {/* Sentence Marker */ numsentences[bn]++; sentmarks[bn][numsentences[bn]] =
@@ -1280,9 +1279,9 @@ void spk_reset_default_chars(void)/* First, free any non-default */ for (i =0 ; i <256 ; i++) { -if ((spk_characters[i] !=NULL ) - && (spk_characters[i] != spk_default_chars[i])) -kfree (spk_characters[i]); +if ((spk_characters[i] !=NULL ) && (spk_characters[i] != + spk_default_chars[i])) +kfree (spk_characters[i]); }memcpy (spk_characters, spk_default_chars,sizeof (spk_default_chars));
@@ -2073,8 +2072,7 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym, tty = vc->port.tty;if (type >=0xf0 ) type -=0xf0 ; -if (type ==KT_PAD - && (vt_get_leds (fg_console,VC_NUMLOCK ))) { +if (type ==KT_PAD && (vt_get_leds (fg_console,VC_NUMLOCK ))) {if (up_flag) { spk_keydown =0 ; goto out;
@@ -2145,10 +2143,8 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,if (up_flag || spk_killed || type ==KT_SHIFT ) goto out; spk_shut_up &=0xfe ; - kh = (value ==KVAL (K_DOWN )) - || (value ==KVAL (K_UP )) - || (value ==KVAL (K_LEFT )) - || (value ==KVAL (K_RIGHT )); + kh = (value ==KVAL (K_DOWN )) || (value ==KVAL (K_UP )) || + (value ==KVAL (K_LEFT )) || (value ==KVAL (K_RIGHT ));if ((cursor_track != read_all_mode) || !kh)if (!spk_no_intr)spk_do_flush ();
Signature · 1 line
2.1.4