Re: [Outreachy kernel] [PATCH 1/3] staging: speakup: Moved logical to previous line.

[Julia Lawall <julia.lawall@lip6.fr>]

The subject appears to be missing some words.  logical what?

On Sun, 19 Mar 2017, Arushi Singhal wrote:

> Moved logical OR operator to previous line to fix the following
> checkpatch issue:

All the instances appear to be && not ||

julia

> CHECK: Logical continuations should be on the previous line.
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
>  drivers/staging/speakup/main.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
> index f280e22d7e15..f71206878363 100644
> --- a/drivers/staging/speakup/main.c
> +++ b/drivers/staging/speakup/main.c
> @@ -905,8 +905,8 @@ static int get_sentence_buf(struct vc_data *vc, int read_punc)
>  	while (start < end) {
>  		sentbuf[bn][i] = 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]] =
> @@ -1292,8 +1292,8 @@ 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]))
> +		if (spk_characters[i] &&
> +		    (spk_characters[i] != spk_default_chars[i]))
>  			kfree(spk_characters[i]);
>  	}
>
> @@ -2088,8 +2088,8 @@ 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;
> --
> 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/20170318202559.10886-2-arushisinghal19971997%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>