Hong Shick Pak, le Thu 01 Jan 2015 04:36:14 -0500, a écrit :
> The multiple statement if/else's should have brackets for all blocks.
>
> Signed-off-by: Hong Shick Pak <hong@xxxxxxxxx>
Acked-By: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
> ---
> drivers/staging/speakup/main.c | 26 +++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index e9f0c15..66a87a0 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -405,8 +405,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));
> }
>
> @@ -562,7 +563,7 @@ static u_long get_word(struct vc_data *vc)
> SPACE)) {
> tmp_pos += 2;
> tmpx++;
> - } else
> + } else {
> while (tmpx > 0) {
> ch = (char)get_char(vc, (u_short *) tmp_pos - 1, &temp);
> if ((ch == SPACE || ch == 0 || IS_WDLM(ch))
> @@ -572,6 +573,7 @@ static u_long get_word(struct vc_data *vc)
> tmp_pos -= 2;
> tmpx--;
> }
> + }
> attr_ch = get_char(vc, (u_short *) tmp_pos, &spk_attr);
> buf[cnt++] = attr_ch & 0xff;
> while (tmpx < vc->vc_cols - 1) {
> @@ -629,8 +631,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 = (char)get_char(vc, (u_short *) spk_pos, &temp);
> if (ch == SPACE || ch == 0)
> @@ -683,8 +686,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;
> }
> @@ -711,8 +715,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;
> @@ -1317,8 +1322,9 @@ static int speakup_allocate(struct vc_data *vc)
> if (speakup_console[vc_num] == NULL)
> return -ENOMEM;
> speakup_date(vc);
> - } else if (!spk_parked)
> + } else if (!spk_parked) {
> speakup_date(vc);
> + }
>
> return 0;
> }
> @@ -1420,8 +1426,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;
> @@ -2138,10 +2145,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)
> --
> 2.2.1
>
> _______________________________________________
> Speakup mailing list
> Speakup@xxxxxxxxxxxxxxxxx
> http://linux-speakup.org/cgi-bin/mailman/listinfo/speakup
--
Samuel
> C'est vrai. FreeBSD pourrait être bien s'il avait une licence
> correcte.
Oh, mon troll-ô-meter vient d'exploser...
-+- OR in Guide du linuxien pervers - "Bien regler son troll-ô-meter"
_______________________________________________
Speakup mailing list
Speakup@xxxxxxxxxxxxxxxxx
http://linux-speakup.org/cgi-bin/mailman/listinfo/speakup
