iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: speakup: fixes braces {} should be used on all arms of this statement

Browse Source 
This patch fixes the checks reported by checkpatch.pl
for braces {} should be used on all arms of this statement.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arushi Singhal 2017-03-21 17:12:28 +05:30 committed by Greg Kroah-Hartman
parent b8f107bc90
commit 0dcb212413
5 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/speakup/main.c
View File

@ -406,8 +406,9 @@ static void say_attributes(struct vc_data *vc)
if (bg > 7) {
synth_printf(" %s ", spk_msg_get(MSG_ON_BLINKING));
bg -= 8;
} else
} else {
synth_printf(" %s ", spk_msg_get(MSG_ON));
}
synth_printf("%s\n", spk_msg_get(MSG_COLORS_START + bg));
}
@ -637,8 +638,9 @@ static void say_prev_word(struct vc_data *vc)
break;
spk_y--;
spk_x = vc->vc_cols - 1;
} else
} else {
spk_x--;
}
spk_pos -= 2;
ch = get_char(vc, (u_short *)spk_pos, &temp);
if (ch == SPACE || ch == 0)
@ -691,8 +693,9 @@ static void say_next_word(struct vc_data *vc)
spk_y++;
spk_x = 0;
edge_said = edge_right;
} else
} else {
spk_x++;
}
spk_pos += 2;
last_state = state;
}
@ -723,8 +726,9 @@ static void spell_word(struct vc_data *vc)
spk_pitch_shift++;
else /* synth has no pitch */
last_cap = spk_str_caps_stop;
} else
} else {
str_cap = spk_str_caps_stop;
}
if (str_cap != last_cap) {
synth_printf("%s", str_cap);
last_cap = str_cap;
@ -1348,8 +1352,9 @@ static int speakup_allocate(struct vc_data *vc)
if (!speakup_console[vc_num])
return -ENOMEM;
speakup_date(vc);
} else if (!spk_parked)
} else if (!spk_parked) {
speakup_date(vc);
}
return 0;
}
@ -1402,9 +1407,9 @@ static void read_all_doc(struct vc_data *vc)
prev_cursor_track = cursor_track;
cursor_track = read_all_mode;
spk_reset_index_count(0);
if (get_sentence_buf(vc, 0) == -1)
if (get_sentence_buf(vc, 0) == -1) {
kbd_fakekey2(vc, RA_DOWN_ARROW);
else {
} else {
say_sentence_num(0, 0);
synth_insert_next_index(0);
start_read_all_timer(vc, RA_TIMER);
@ -1451,8 +1456,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
if (!say_sentence_num(sentcount + 1, 1)) {
sn = 1;
spk_reset_index_count(sn);
} else
} else {
synth_insert_next_index(0);
}
if (!say_sentence_num(sn, 0)) {
kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
return;
@ -1481,9 +1487,9 @@ static void handle_cursor_read_all(struct vc_data *vc, int command)
rv = get_sentence_buf(vc, 0);
if (rv == -1)
read_all_doc(vc);
if (rv == 0)
if (rv == 0) {
kbd_fakekey2(vc, RA_FIND_NEXT_SENT);
else {
} else {
say_sentence_num(1, 0);
synth_insert_next_index(0);
start_read_all_timer(vc, RA_TIMER);
@ -2179,10 +2185,11 @@ no_map:
if (type == KT_SPEC && value == 1) {
value = '\n';
type = KT_LATIN;
} else if (type == KT_LETTER)
} else if (type == KT_LETTER) {
type = KT_LATIN;
else if (value == 0x7f)
} else if (value == 0x7f) {
value = 8; /* make del = backspace */
}
ret = (*spk_special_handler) (vc, type, value, keycode);
spk_close_press = 0;
if (ret < 0)
@ -2276,9 +2283,9 @@ static int vt_notifier_call(struct notifier_block *nb,
speakup_deallocate(vc);
break;
case VT_WRITE:
if (param->c == '\b')
if (param->c == '\b') {
speakup_bs(vc);
else {
} else {
u16 d = param->c;
speakup_con_write(vc, &d, 1);
}

6
drivers/staging/speakup/speakup_decext.c
View File

@ -195,11 +195,11 @@ static void do_catch_up(struct spk_synth *synth)
spin_lock_irqsave(&speakup_info.spinlock, flags);
synth_buffer_getc();
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
if (ch == '[')
if (ch == '[') {
in_escape = 1;
else if (ch == ']')
} else if (ch == ']') {
in_escape = 0;
else if (ch <= SPACE) {
} else if (ch <= SPACE) {
if (!in_escape && strchr(",.!?;:", last))
synth->io_ops->synth_out(synth, PROCSPEECH);
if (time_after_eq(jiffies, jiff_max)) {

6
drivers/staging/speakup/speakup_decpc.c
View File

@ -410,11 +410,11 @@ static void do_catch_up(struct spk_synth *synth)
spin_lock_irqsave(&speakup_info.spinlock, flags);
synth_buffer_getc();
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
if (ch == '[')
if (ch == '[') {
in_escape = 1;
else if (ch == ']')
} else if (ch == ']') {
in_escape = 0;
else if (ch <= SPACE) {
} else if (ch <= SPACE) {
if (!in_escape && strchr(",.!?;:", last))
dt_sendchar(PROCSPEECH);
if (time_after_eq(jiffies, jiff_max)) {

6
drivers/staging/speakup/speakup_dectlk.c
View File

@ -260,11 +260,11 @@ static void do_catch_up(struct spk_synth *synth)
spin_lock_irqsave(&speakup_info.spinlock, flags);
synth_buffer_getc();
spin_unlock_irqrestore(&speakup_info.spinlock, flags);
if (ch == '[')
if (ch == '[') {
in_escape = 1;
else if (ch == ']')
} else if (ch == ']') {
in_escape = 0;
else if (ch <= SPACE) {
} else if (ch <= SPACE) {
if (!in_escape && strchr(",.!?;:", last))
synth->io_ops->synth_out(synth, PROCSPEECH);
if (time_after_eq(jiffies, jiff_max)) {

12
drivers/staging/speakup/varhandlers.c
View File

@ -258,10 +258,11 @@ int spk_set_string_var(const char *page, struct st_var_header *var, int len)
if (var->p_val != var_data->u.s.default_val)
strcpy((char *)var->p_val, var_data->u.s.default_val);
return -ERESTART;
} else if (var->p_val)
} else if (var->p_val) {
strcpy((char *)var->p_val, page);
else
} else {
return -E2BIG;
}
return 0;
}
@ -281,17 +282,18 @@ int spk_set_mask_bits(const char *input, const int which, const int how)
spk_chartab[*cp] &= ~mask;
}
cp = (u_char *)input;
if (!cp)
if (!cp) {
cp = spk_punc_info[which].value;
else {
} else {
for (; *cp; cp++) {
if (*cp < SPACE)
break;
if (mask < PUNC) {
if (!(spk_chartab[*cp] & PUNC))
break;
} else if (spk_chartab[*cp] & B_NUM)
} else if (spk_chartab[*cp] & B_NUM) {
break;
}
}
if (*cp)
return -EINVAL;