All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: speakup: else is not generally useful after a break or return
@ 2017-03-03 15:55 Arushi Singhal
  2017-03-03 16:03 ` [Outreachy kernel] " Julia Lawall
  2017-03-06 12:59 ` kbuild test robot
  0 siblings, 2 replies; 7+ messages in thread
From: Arushi Singhal @ 2017-03-03 15:55 UTC (permalink / raw)
  To: w.d.hubbs
  Cc: Chris Brannon, Kirk Reiser, Samuel Thibault, Greg Kroah-Hartman,
	speakup, devel, linux-kernel, outreachy-kernel

fixed checkpatch.pl warning: else is not generally useful after a break
or return.
Removed the else without affecting the logic.
Dead code is also eliminated.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
 drivers/staging/speakup/keyhelp.c | 53 ++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c
index 4e6e5daba50c..ad3efded37c1 100644
--- a/drivers/staging/speakup/keyhelp.c
+++ b/drivers/staging/speakup/keyhelp.c
@@ -176,43 +176,28 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
 		synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));
 		build_key_data(); /* rebuild each time in case new mapping */
 		return 1;
-	} else {
-		name = NULL;
-		if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
-			synth_printf("%s\n",
-				     spk_msg_get(MSG_KEYNAMES_START + key - 1));
-			return 1;
-		}
-		for (i = 0; funcvals[i] != 0 && !name; i++) {
-			if (ch == funcvals[i])
-				name = spk_msg_get(MSG_FUNCNAMES_START + i);
-		}
-		if (!name)
-			return -1;
-		kp = spk_our_keys[key] + 1;
-		for (i = 0; i < nstates; i++) {
-			if (ch == kp[i])
-				break;
-		}
-		key += (state_tbl[i] << 8);
-		say_key(key);
-		synth_printf(spk_msg_get(MSG_KEYDESC), name);
-		synth_printf("\n");
-		return 1;
 	}
-	name = spk_msg_get(MSG_FUNCNAMES_START + cur_item);
-	func = funcvals[cur_item];
-	synth_printf("%s", name);
-	if (key_offsets[func] == 0) {
-		synth_printf(" %s\n", spk_msg_get(MSG_IS_UNASSIGNED));
+
+	name = NULL;
+	if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
+		synth_printf("%s\n",
+			     spk_msg_get(MSG_KEYNAMES_START + key - 1));
 		return 1;
 	}
-	p_keys = key_data + key_offsets[func];
-	for (n = 0; p_keys[n]; n++) {
-		val = p_keys[n];
-		if (n > 0)
-			synth_printf("%s ", spk_msg_get(MSG_DISJUNCTION));
-		say_key(val);
+	for (i = 0; funcvals[i] != 0 && !name; i++) {
+		if (ch == funcvals[i])
+			name = spk_msg_get(MSG_FUNCNAMES_START + i);
+	}
+	if (!name)
+		return -1;
+	kp = spk_our_keys[key] + 1;
+	for (i = 0; i < nstates; i++) {
+		if (ch == kp[i])
+			break;
 	}
+	key += (state_tbl[i] << 8);
+	say_key(key);
+	synth_printf(spk_msg_get(MSG_KEYDESC), name);
+	synth_printf("\n");
 	return 1;
 }
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [Outreachy kernel] [PATCH] staging: speakup: else is not generally useful after a break or return
  2017-03-03 15:55 [PATCH] staging: speakup: else is not generally useful after a break or return Arushi Singhal
@ 2017-03-03 16:03 ` Julia Lawall
  2017-03-03 16:50   ` Arushi Singhal
  2017-03-03 17:48   ` Dan Carpenter
  2017-03-06 12:59 ` kbuild test robot
  1 sibling, 2 replies; 7+ messages in thread
From: Julia Lawall @ 2017-03-03 16:03 UTC (permalink / raw)
  To: Arushi Singhal
  Cc: w.d.hubbs, Chris Brannon, Kirk Reiser, Samuel Thibault,
	Greg Kroah-Hartman, speakup, devel, linux-kernel,
	outreachy-kernel



On Fri, 3 Mar 2017, Arushi Singhal wrote:

> fixed checkpatch.pl warning: else is not generally useful after a break
> or return.
> Removed the else without affecting the logic.
> Dead code is also eliminated.

The chhange is not correct.  There is a big chain of if/else if.  The if
(type == KT_LATIN) can reach the code at the end of the file.

julia

>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
>  drivers/staging/speakup/keyhelp.c | 53 ++++++++++++++-------------------------
>  1 file changed, 19 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/staging/speakup/keyhelp.c b/drivers/staging/speakup/keyhelp.c
> index 4e6e5daba50c..ad3efded37c1 100644
> --- a/drivers/staging/speakup/keyhelp.c
> +++ b/drivers/staging/speakup/keyhelp.c
> @@ -176,43 +176,28 @@ int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
>  		synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));
>  		build_key_data(); /* rebuild each time in case new mapping */
>  		return 1;
> -	} else {
> -		name = NULL;
> -		if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
> -			synth_printf("%s\n",
> -				     spk_msg_get(MSG_KEYNAMES_START + key - 1));
> -			return 1;
> -		}
> -		for (i = 0; funcvals[i] != 0 && !name; i++) {
> -			if (ch == funcvals[i])
> -				name = spk_msg_get(MSG_FUNCNAMES_START + i);
> -		}
> -		if (!name)
> -			return -1;
> -		kp = spk_our_keys[key] + 1;
> -		for (i = 0; i < nstates; i++) {
> -			if (ch == kp[i])
> -				break;
> -		}
> -		key += (state_tbl[i] << 8);
> -		say_key(key);
> -		synth_printf(spk_msg_get(MSG_KEYDESC), name);
> -		synth_printf("\n");
> -		return 1;
>  	}
> -	name = spk_msg_get(MSG_FUNCNAMES_START + cur_item);
> -	func = funcvals[cur_item];
> -	synth_printf("%s", name);
> -	if (key_offsets[func] == 0) {
> -		synth_printf(" %s\n", spk_msg_get(MSG_IS_UNASSIGNED));
> +
> +	name = NULL;
> +	if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
> +		synth_printf("%s\n",
> +			     spk_msg_get(MSG_KEYNAMES_START + key - 1));
>  		return 1;
>  	}
> -	p_keys = key_data + key_offsets[func];
> -	for (n = 0; p_keys[n]; n++) {
> -		val = p_keys[n];
> -		if (n > 0)
> -			synth_printf("%s ", spk_msg_get(MSG_DISJUNCTION));
> -		say_key(val);
> +	for (i = 0; funcvals[i] != 0 && !name; i++) {
> +		if (ch == funcvals[i])
> +			name = spk_msg_get(MSG_FUNCNAMES_START + i);
> +	}
> +	if (!name)
> +		return -1;
> +	kp = spk_our_keys[key] + 1;
> +	for (i = 0; i < nstates; i++) {
> +		if (ch == kp[i])
> +			break;
>  	}
> +	key += (state_tbl[i] << 8);
> +	say_key(key);
> +	synth_printf(spk_msg_get(MSG_KEYDESC), name);
> +	synth_printf("\n");
>  	return 1;
>  }
> --
> 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/20170303155557.GA23744%40arushi-HP-Pavilion-Notebook.
> For more options, visit https://groups.google.com/d/optout.
>


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Outreachy kernel] [PATCH] staging: speakup: else is not generally useful after a break or return
  2017-03-03 16:03 ` [Outreachy kernel] " Julia Lawall
@ 2017-03-03 16:50   ` Arushi Singhal
  2017-03-03 16:54     ` Julia Lawall
  2017-03-03 17:48   ` Dan Carpenter
  1 sibling, 1 reply; 7+ messages in thread
From: Arushi Singhal @ 2017-03-03 16:50 UTC (permalink / raw)
  To: outreachy-kernel
  Cc: arushisinghal19971997, w.d.hubbs, chris, kirk, samuel.thibault,
	gregkh, speakup, devel, linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 4539 bytes --]



On Friday, March 3, 2017 at 9:33:22 PM UTC+5:30, Julia Lawall wrote:
>
>
>
> On Fri, 3 Mar 2017, Arushi Singhal wrote: 
>
> > fixed checkpatch.pl warning: else is not generally useful after a break 
> > or return. 
> > Removed the else without affecting the logic. 
> > Dead code is also eliminated. 
>
> The chhange is not correct.  There is a big chain of if/else if.  The if 
> (type == KT_LATIN) can reach the code at the end of the file. 
>
If there is else and all if/else have return statement so then the code 
will not reach at the end. 
 Thanks
Aruhsi

> \
> julia 
>
> > 
> > Signed-off-by: Arushi Singhal <arushising...@gmail.com <javascript:>> 
> > --- 
> >  drivers/staging/speakup/keyhelp.c | 53 
> ++++++++++++++------------------------- 
> >  1 file changed, 19 insertions(+), 34 deletions(-) 
> > 
> > diff --git a/drivers/staging/speakup/keyhelp.c 
> b/drivers/staging/speakup/keyhelp.c 
> > index 4e6e5daba50c..ad3efded37c1 100644 
> > --- a/drivers/staging/speakup/keyhelp.c 
> > +++ b/drivers/staging/speakup/keyhelp.c 
> > @@ -176,43 +176,28 @@ int spk_handle_help(struct vc_data *vc, u_char 
> type, u_char ch, u_short key) 
> >                  synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO)); 
> >                  build_key_data(); /* rebuild each time in case new 
> mapping */ 
> >                  return 1; 
> > -        } else { 
> > -                name = NULL; 
> > -                if ((type != KT_SPKUP) && (key > 0) && (key <= 
> num_key_names)) { 
> > -                        synth_printf("%s\n", 
> > -                                     spk_msg_get(MSG_KEYNAMES_START + 
> key - 1)); 
> > -                        return 1; 
> > -                } 
> > -                for (i = 0; funcvals[i] != 0 && !name; i++) { 
> > -                        if (ch == funcvals[i]) 
> > -                                name = spk_msg_get(MSG_FUNCNAMES_START 
> + i); 
> > -                } 
> > -                if (!name) 
> > -                        return -1; 
> > -                kp = spk_our_keys[key] + 1; 
> > -                for (i = 0; i < nstates; i++) { 
> > -                        if (ch == kp[i]) 
> > -                                break; 
> > -                } 
> > -                key += (state_tbl[i] << 8); 
> > -                say_key(key); 
> > -                synth_printf(spk_msg_get(MSG_KEYDESC), name); 
> > -                synth_printf("\n"); 
> > -                return 1; 
> >          } 
> > -        name = spk_msg_get(MSG_FUNCNAMES_START + cur_item); 
> > -        func = funcvals[cur_item]; 
> > -        synth_printf("%s", name); 
> > -        if (key_offsets[func] == 0) { 
> > -                synth_printf(" %s\n", spk_msg_get(MSG_IS_UNASSIGNED)); 
> > + 
> > +        name = NULL; 
> > +        if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) 
> { 
> > +                synth_printf("%s\n", 
> > +                             spk_msg_get(MSG_KEYNAMES_START + key - 
> 1)); 
> >                  return 1; 
> >          } 
> > -        p_keys = key_data + key_offsets[func]; 
> > -        for (n = 0; p_keys[n]; n++) { 
> > -                val = p_keys[n]; 
> > -                if (n > 0) 
> > -                        synth_printf("%s ", 
> spk_msg_get(MSG_DISJUNCTION)); 
> > -                say_key(val); 
> > +        for (i = 0; funcvals[i] != 0 && !name; i++) { 
> > +                if (ch == funcvals[i]) 
> > +                        name = spk_msg_get(MSG_FUNCNAMES_START + i); 
> > +        } 
> > +        if (!name) 
> > +                return -1; 
> > +        kp = spk_our_keys[key] + 1; 
> > +        for (i = 0; i < nstates; i++) { 
> > +                if (ch == kp[i]) 
> > +                        break; 
> >          } 
> > +        key += (state_tbl[i] << 8); 
> > +        say_key(key); 
> > +        synth_printf(spk_msg_get(MSG_KEYDESC), name); 
> > +        synth_printf("\n"); 
> >          return 1; 
> >  } 
> > -- 
> > 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-kern...@googlegroups.com <javascript:>. 
> > To post to this group, send email to outreach...@googlegroups.com 
> <javascript:>. 
> > To view this discussion on the web visit 
> https://groups.google.com/d/msgid/outreachy-kernel/20170303155557.GA23744%40arushi-HP-Pavilion-Notebook. 
>
> > For more options, visit https://groups.google.com/d/optout. 
> > 
>

[-- Attachment #1.2: Type: text/html, Size: 8206 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Outreachy kernel] [PATCH] staging: speakup: else is not generally useful after a break or return
  2017-03-03 16:50   ` Arushi Singhal
@ 2017-03-03 16:54     ` Julia Lawall
  2017-03-03 17:18       ` Arushi Singhal
  0 siblings, 1 reply; 7+ messages in thread
From: Julia Lawall @ 2017-03-03 16:54 UTC (permalink / raw)
  To: Arushi Singhal
  Cc: outreachy-kernel, w.d.hubbs, chris, kirk, samuel.thibault,
	gregkh, speakup, devel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 6624 bytes --]



On Fri, 3 Mar 2017, Arushi Singhal wrote:

>
>
> On Friday, March 3, 2017 at 9:33:22 PM UTC+5:30, Julia Lawall wrote:
>
>
>       On Fri, 3 Mar 2017, Arushi Singhal wrote:
>
>       > fixed checkpatch.pl warning: else is not generally useful
>       after a break
>       > or return.
>       > Removed the else without affecting the logic.
>       > Dead code is also eliminated.
>
>       The chhange is not correct.  There is a big chain of if/else if.
>        The if
>       (type == KT_LATIN) can reach the code at the end of the file.
>
> If there is else and all if/else have return statement so then the code will
> not reach at the end.

The first one does not end in a return.

julia

>  Thanks
> Aruhsi
>       \
>       julia
>
>       >
>       > Signed-off-by: Arushi Singhal <arushising...@gmail.com>
>       > ---
>       >  drivers/staging/speakup/keyhelp.c | 53
>       ++++++++++++++-------------------------
>       >  1 file changed, 19 insertions(+), 34 deletions(-)
>       >
>       > diff --git a/drivers/staging/speakup/keyhelp.c
>       b/drivers/staging/speakup/keyhelp.c
>       > index 4e6e5daba50c..ad3efded37c1 100644
>       > --- a/drivers/staging/speakup/keyhelp.c
>       > +++ b/drivers/staging/speakup/keyhelp.c
>       > @@ -176,43 +176,28 @@ int spk_handle_help(struct vc_data *vc,
>       u_char type, u_char ch, u_short key)
>       >                  synth_printf("%s\n",
>       spk_msg_get(MSG_HELP_INFO));
>       >                  build_key_data(); /* rebuild each time in
>       case new mapping */
>       >                  return 1;
>       > -        } else {
>       > -                name = NULL;
>       > -                if ((type != KT_SPKUP) && (key > 0) && (key
>       <= num_key_names)) {
>       > -                        synth_printf("%s\n",
>       > -                                    
>       spk_msg_get(MSG_KEYNAMES_START + key - 1));
>       > -                        return 1;
>       > -                }
>       > -                for (i = 0; funcvals[i] != 0 && !name; i++) {
>       > -                        if (ch == funcvals[i])
>       > -                                name =
>       spk_msg_get(MSG_FUNCNAMES_START + i);
>       > -                }
>       > -                if (!name)
>       > -                        return -1;
>       > -                kp = spk_our_keys[key] + 1;
>       > -                for (i = 0; i < nstates; i++) {
>       > -                        if (ch == kp[i])
>       > -                                break;
>       > -                }
>       > -                key += (state_tbl[i] << 8);
>       > -                say_key(key);
>       > -                synth_printf(spk_msg_get(MSG_KEYDESC), name);
>       > -                synth_printf("\n");
>       > -                return 1;
>       >          }
>       > -        name = spk_msg_get(MSG_FUNCNAMES_START + cur_item);
>       > -        func = funcvals[cur_item];
>       > -        synth_printf("%s", name);
>       > -        if (key_offsets[func] == 0) {
>       > -                synth_printf(" %s\n",
>       spk_msg_get(MSG_IS_UNASSIGNED));
>       > +
>       > +        name = NULL;
>       > +        if ((type != KT_SPKUP) && (key > 0) && (key <=
>       num_key_names)) {
>       > +                synth_printf("%s\n",
>       > +                             spk_msg_get(MSG_KEYNAMES_START +
>       key - 1));
>       >                  return 1;
>       >          }
>       > -        p_keys = key_data + key_offsets[func];
>       > -        for (n = 0; p_keys[n]; n++) {
>       > -                val = p_keys[n];
>       > -                if (n > 0)
>       > -                        synth_printf("%s ",
>       spk_msg_get(MSG_DISJUNCTION));
>       > -                say_key(val);
>       > +        for (i = 0; funcvals[i] != 0 && !name; i++) {
>       > +                if (ch == funcvals[i])
>       > +                        name =
>       spk_msg_get(MSG_FUNCNAMES_START + i);
>       > +        }
>       > +        if (!name)
>       > +                return -1;
>       > +        kp = spk_our_keys[key] + 1;
>       > +        for (i = 0; i < nstates; i++) {
>       > +                if (ch == kp[i])
>       > +                        break;
>       >          }
>       > +        key += (state_tbl[i] << 8);
>       > +        say_key(key);
>       > +        synth_printf(spk_msg_get(MSG_KEYDESC), name);
>       > +        synth_printf("\n");
>       >          return 1;
>       >  }
>       > --
>       > 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-kern...@googlegroups.com.
>       > To post to this group, send email to
>       outreach...@googlegroups.com.
>       > To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/20170303155557.GA23744%4
>       0arushi-HP-Pavilion-Notebook.
>       > For more options, visit https://groups.google.com/d/optout.
>       >
>
> --
> 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 visithttps://groups.google.com/d/msgid/outreachy-kernel/cc06f004-d16e-4e67-86fb-
> 5e1b099c811a%40googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Outreachy kernel] [PATCH] staging: speakup: else is not generally useful after a break or return
  2017-03-03 16:54     ` Julia Lawall
@ 2017-03-03 17:18       ` Arushi Singhal
  0 siblings, 0 replies; 7+ messages in thread
From: Arushi Singhal @ 2017-03-03 17:18 UTC (permalink / raw)
  To: outreachy-kernel
  Cc: arushisinghal19971997, w.d.hubbs, chris, kirk, samuel.thibault,
	gregkh, speakup, devel, linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 6275 bytes --]



On Friday, March 3, 2017 at 10:24:29 PM UTC+5:30, Julia Lawall wrote:
>
>
>
> On Fri, 3 Mar 2017, Arushi Singhal wrote: 
>
> > 
> > 
> > On Friday, March 3, 2017 at 9:33:22 PM UTC+5:30, Julia Lawall wrote: 
> > 
> > 
> >       On Fri, 3 Mar 2017, Arushi Singhal wrote: 
> > 
> >       > fixed checkpatch.pl warning: else is not generally useful 
> >       after a break 
> >       > or return. 
> >       > Removed the else without affecting the logic. 
> >       > Dead code is also eliminated. 
> > 
> >       The chhange is not correct.  There is a big chain of if/else if. 
> >        The if 
> >       (type == KT_LATIN) can reach the code at the end of the file. 
> > 
> > If there is else and all if/else have return statement so then the code 
> will 
> > not reach at the end. 
>
> The first one does not end in a return. 
>
Thanks I got my mistake.
Regards 
Arushi 

>
> julia 
>
> >  Thanks 
> > Aruhsi 
> >       \ 
> >       julia 
> > 
> >       > 
> >       > Signed-off-by: Arushi Singhal <arushising...@gmail.com> 
> >       > --- 
> >       >  drivers/staging/speakup/keyhelp.c | 53 
> >       ++++++++++++++------------------------- 
> >       >  1 file changed, 19 insertions(+), 34 deletions(-) 
> >       > 
> >       > diff --git a/drivers/staging/speakup/keyhelp.c 
> >       b/drivers/staging/speakup/keyhelp.c 
> >       > index 4e6e5daba50c..ad3efded37c1 100644 
> >       > --- a/drivers/staging/speakup/keyhelp.c 
> >       > +++ b/drivers/staging/speakup/keyhelp.c 
> >       > @@ -176,43 +176,28 @@ int spk_handle_help(struct vc_data *vc, 
> >       u_char type, u_char ch, u_short key) 
> >       >                  synth_printf("%s\n", 
> >       spk_msg_get(MSG_HELP_INFO)); 
> >       >                  build_key_data(); /* rebuild each time in 
> >       case new mapping */ 
> >       >                  return 1; 
> >       > -        } else { 
> >       > -                name = NULL; 
> >       > -                if ((type != KT_SPKUP) && (key > 0) && (key 
> >       <= num_key_names)) { 
> >       > -                        synth_printf("%s\n", 
> >       > -                                     
> >       spk_msg_get(MSG_KEYNAMES_START + key - 1)); 
> >       > -                        return 1; 
> >       > -                } 
> >       > -                for (i = 0; funcvals[i] != 0 && !name; i++) { 
> >       > -                        if (ch == funcvals[i]) 
> >       > -                                name = 
> >       spk_msg_get(MSG_FUNCNAMES_START + i); 
> >       > -                } 
> >       > -                if (!name) 
> >       > -                        return -1; 
> >       > -                kp = spk_our_keys[key] + 1; 
> >       > -                for (i = 0; i < nstates; i++) { 
> >       > -                        if (ch == kp[i]) 
> >       > -                                break; 
> >       > -                } 
> >       > -                key += (state_tbl[i] << 8); 
> >       > -                say_key(key); 
> >       > -                synth_printf(spk_msg_get(MSG_KEYDESC), name); 
> >       > -                synth_printf("\n"); 
> >       > -                return 1; 
> >       >          } 
> >       > -        name = spk_msg_get(MSG_FUNCNAMES_START + cur_item); 
> >       > -        func = funcvals[cur_item]; 
> >       > -        synth_printf("%s", name); 
> >       > -        if (key_offsets[func] == 0) { 
> >       > -                synth_printf(" %s\n", 
> >       spk_msg_get(MSG_IS_UNASSIGNED)); 
> >       > + 
> >       > +        name = NULL; 
> >       > +        if ((type != KT_SPKUP) && (key > 0) && (key <= 
> >       num_key_names)) { 
> >       > +                synth_printf("%s\n", 
> >       > +                             spk_msg_get(MSG_KEYNAMES_START + 
> >       key - 1)); 
> >       >                  return 1; 
> >       >          } 
> >       > -        p_keys = key_data + key_offsets[func]; 
> >       > -        for (n = 0; p_keys[n]; n++) { 
> >       > -                val = p_keys[n]; 
> >       > -                if (n > 0) 
> >       > -                        synth_printf("%s ", 
> >       spk_msg_get(MSG_DISJUNCTION)); 
> >       > -                say_key(val); 
> >       > +        for (i = 0; funcvals[i] != 0 && !name; i++) { 
> >       > +                if (ch == funcvals[i]) 
> >       > +                        name = 
> >       spk_msg_get(MSG_FUNCNAMES_START + i); 
> >       > +        } 
> >       > +        if (!name) 
> >       > +                return -1; 
> >       > +        kp = spk_our_keys[key] + 1; 
> >       > +        for (i = 0; i < nstates; i++) { 
> >       > +                if (ch == kp[i]) 
> >       > +                        break; 
> >       >          } 
> >       > +        key += (state_tbl[i] << 8); 
> >       > +        say_key(key); 
> >       > +        synth_printf(spk_msg_get(MSG_KEYDESC), name); 
> >       > +        synth_printf("\n"); 
> >       >          return 1; 
> >       >  } 
> >       > -- 
> >       > 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-kern...@googlegroups.com. 
> >       > To post to this group, send email to 
> >       outreach...@googlegroups.com. 
> >       > To view this discussion on the web visithttps://
> groups.google.com/d/msgid/outreachy-kernel/20170303155557.GA23744%4 
> >       0arushi-HP-Pavilion-Notebook. 
> >       > For more options, visit https://groups.google.com/d/optout. 
> >       > 
> > 
> > -- 
> > 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-kern...@googlegroups.com <javascript:>. 
> > To post to this group, send email to outreach...@googlegroups.com 
> <javascript:>. 
> > To view this discussion on the web visithttps://
> groups.google.com/d/msgid/outreachy-kernel/cc06f004-d16e-4e67-86fb- 
> > 5e1b099c811a%40googlegroups.com. 
> > For more options, visit https://groups.google.com/d/optout. 
> > 
> >


[-- Attachment #1.2: Type: text/html, Size: 11582 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Outreachy kernel] [PATCH] staging: speakup: else is not generally useful after a break or return
  2017-03-03 16:03 ` [Outreachy kernel] " Julia Lawall
  2017-03-03 16:50   ` Arushi Singhal
@ 2017-03-03 17:48   ` Dan Carpenter
  1 sibling, 0 replies; 7+ messages in thread
From: Dan Carpenter @ 2017-03-03 17:48 UTC (permalink / raw)
  To: Julia Lawall
  Cc: Arushi Singhal, devel, Kirk Reiser, Greg Kroah-Hartman, speakup,
	linux-kernel, outreachy-kernel, Samuel Thibault, Chris Brannon

On Fri, Mar 03, 2017 at 05:03:09PM +0100, Julia Lawall wrote:
> 
> 
> On Fri, 3 Mar 2017, Arushi Singhal wrote:
> 
> > fixed checkpatch.pl warning: else is not generally useful after a break
> > or return.
> > Removed the else without affecting the logic.
> > Dead code is also eliminated.
> 
> The chhange is not correct.  There is a big chain of if/else if.  The if
> (type == KT_LATIN) can reach the code at the end of the file.
> 

Yeah.  And KT_CUR as well.

regards,
dan carpenter



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] staging: speakup: else is not generally useful after a break or return
  2017-03-03 15:55 [PATCH] staging: speakup: else is not generally useful after a break or return Arushi Singhal
  2017-03-03 16:03 ` [Outreachy kernel] " Julia Lawall
@ 2017-03-06 12:59 ` kbuild test robot
  1 sibling, 0 replies; 7+ messages in thread
From: kbuild test robot @ 2017-03-06 12:59 UTC (permalink / raw)
  To: Arushi Singhal
  Cc: kbuild-all, w.d.hubbs, devel, Kirk Reiser, Greg Kroah-Hartman,
	speakup, linux-kernel, outreachy-kernel, Samuel Thibault,
	Chris Brannon

[-- Attachment #1: Type: text/plain, Size: 2341 bytes --]

Hi Arushi,

[auto build test WARNING on staging/staging-testing]
[cannot apply to v4.11-rc1 next-20170306]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Arushi-Singhal/staging-speakup-else-is-not-generally-useful-after-a-break-or-return/20170306-072009
config: openrisc-allmodconfig (attached as .config)
compiler: or32-linux-gcc (GCC) 4.5.1-or32-1.0rc1
reproduce:
        wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=openrisc 

All warnings (new ones prefixed by >>):

   drivers/staging/speakup/keyhelp.c: In function 'spk_handle_help':
>> drivers/staging/speakup/keyhelp.c:146:19: warning: unused variable 'val'
>> drivers/staging/speakup/keyhelp.c:146:11: warning: unused variable 'p_keys'
>> drivers/staging/speakup/keyhelp.c:145:9: warning: unused variable 'func'
>> drivers/staging/speakup/keyhelp.c:143:9: warning: unused variable 'n'

vim +/val +146 drivers/staging/speakup/keyhelp.c

c6e3fd22c William Hubbs   2010-10-07  137  	}
c6e3fd22c William Hubbs   2010-10-07  138  	return 0;
c6e3fd22c William Hubbs   2010-10-07  139  }
c6e3fd22c William Hubbs   2010-10-07  140  
ca2beaf84 Samuel Thibault 2013-01-02  141  int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
c6e3fd22c William Hubbs   2010-10-07  142  {
c6e3fd22c William Hubbs   2010-10-07 @143  	int i, n;
c6e3fd22c William Hubbs   2010-10-07  144  	char *name;
c6e3fd22c William Hubbs   2010-10-07 @145  	u_char func, *kp;
c6e3fd22c William Hubbs   2010-10-07 @146  	u_short *p_keys, val;
8e69a8110 Domagoj Trsan   2014-09-09  147  
c6e3fd22c William Hubbs   2010-10-07  148  	if (letter_offsets[0] == -1)
c6e3fd22c William Hubbs   2010-10-07  149  		help_init();

:::::: The code at line 146 was first introduced by commit
:::::: c6e3fd22cd538365bfeb82997d5b89562e077d42 Staging: add speakup to the staging directory

:::::: TO: William Hubbs <w.d.hubbs@gmail.com>
:::::: CC: Greg Kroah-Hartman <gregkh@suse.de>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 40416 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2017-03-06 12:59 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-03 15:55 [PATCH] staging: speakup: else is not generally useful after a break or return Arushi Singhal
2017-03-03 16:03 ` [Outreachy kernel] " Julia Lawall
2017-03-03 16:50   ` Arushi Singhal
2017-03-03 16:54     ` Julia Lawall
2017-03-03 17:18       ` Arushi Singhal
2017-03-03 17:48   ` Dan Carpenter
2017-03-06 12:59 ` kbuild test robot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.