Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1592211 > unrolled thread

Re: [Outreachy kernel] [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [Outreachy kernel] [PATCH 6/6] staging: speakup: fixes braces  {} should be used on all arms of this statement Julia Lawall <julia.lawall@lip6.fr> - 2017-03-03 19:50 +0100
    Re: [Outreachy kernel] [PATCH 6/6] staging: speakup: fixes braces  {} should be used on all arms of this statement Joe Perches <joe@perches.com> - 2017-03-03 21:20 +0100

#1592211 — Re: [Outreachy kernel] [PATCH 6/6] staging: speakup: fixes braces {} should be used on all arms of this statement

On Sat, 4 Mar 2017, Arushi Singhal wrote:

> 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>
> ---
>  drivers/staging/speakup/main.c | 29 +++++++++++++++++++----------
>  1 file changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index 7915e75664f4..6179e0aafa25 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -640,8 +640,9 @@ static void say_prev_word(struct vc_data *vc)
>  				break;
>  			spk_y--;
>  			spk_x = vc->vc_cols - 1;
> -		} else
> +		} else{

else needs a space after it.

julia

>  			spk_x--;
> +		}
>  		spk_pos -= 2;
>  		ch = (char)get_char(vc, (u_short *)spk_pos, &temp);
>  		if (ch == SPACE || ch == 0)
> @@ -694,8 +695,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;
>  	}
> @@ -722,8 +724,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;
> @@ -1331,8 +1334,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;
>  }
> @@ -1385,8 +1389,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 {
>  		say_sentence_num(0, 0);
>  		synth_insert_next_index(0);
> @@ -1434,8 +1439,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;
> @@ -1464,8 +1470,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 {
>  			say_sentence_num(1, 0);
>  			synth_insert_next_index(0);
> @@ -2162,10 +2169,11 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
>  		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)
> @@ -2259,8 +2267,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 if (param->c < 0x100) {
>  			char d = param->c;
>
> --
> 2.11.0
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170303183707.14830-7-arushisinghal19971997%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

[toc] | [next] | [standalone]

#1592273

On Fri, 2017-03-03 at 19:40 +0100, Julia Lawall wrote:
> On Sat, 4 Mar 2017, Arushi Singhal wrote:
> > 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>
> > ---
> >  drivers/staging/speakup/main.c | 29 +++++++++++++++++++----------
> >  1 file changed, 19 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> > index 7915e75664f4..6179e0aafa25 100644
> > --- a/drivers/staging/speakup/main.c
> > +++ b/drivers/staging/speakup/main.c
> > @@ -640,8 +640,9 @@ static void say_prev_word(struct vc_data *vc)
> >  				break;
> >  			spk_y--;
> >  			spk_x = vc->vc_cols - 1;
> > -		} else
> > +		} else{
> 
> else needs a space after it.

And if you had scanned this suggested patch with
checkpatch, you would have known that.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web