Possible corrupt file or patch

Possible corrupt file or patch

[Walt Feasel]

I have a few files that look perfectly fine in nano and
gedit but the patch file that gets made shows the columns
out of alignment. I have remade them several
times to the same effect. I have also made sure that
there isnt a tab and space mix. Is this a bug that
happens sometimes or do I need to do something to
fix this?

I would really appreciate any assistance on this or
feed back that this file does the same for others.

Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
---
v2 makes changes to correct for email format patch submission

 drivers/staging/speakup/speakup_decpc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
index 9e16498..813461c 100644
--- a/drivers/staging/speakup/speakup_decpc.c
+++ b/drivers/staging/speakup/speakup_decpc.c
@@ -75,12 +75,12 @@
 #define	CTRL_buff_free		0x0800	/* buffer remain count */
 #define	CTRL_buff_used		0x0900	/* buffer in use */
 #define	CTRL_speech		0x0a00	/* immediate speech change */
-#define	   CTRL_SP_voice	0x0001	/* voice change */
-#define	   CTRL_SP_rate		0x0002	/* rate change */
-#define	   CTRL_SP_comma	0x0003	/* comma pause change */
-#define	   CTRL_SP_period	0x0004	/* period pause change */
-#define	   CTRL_SP_rate_delta	0x0005	/* delta rate change */
-#define	   CTRL_SP_get_param	0x0006	/* return the desired parameter */
+#define CTRL_SP_voice		0x0001	/* voice change */
+#define CTRL_SP_rate		0x0002	/* rate change */
+#define CTRL_SP_comma		0x0003	/* comma pause change */
+#define CTRL_SP_period		0x0004	/* period pause change */
+#define CTRL_SP_rate_delta	0x0005	/* delta rate change */
+#define CTRL_SP_get_param	0x0006	/* return the desired parameter */
 #define	CTRL_last_index		0x0b00	/* get last index spoken */
 #define	CTRL_io_priority	0x0c00	/* change i/o priority */
 #define	CTRL_free_mem		0x0d00	/* get free paragraphs on module */
-- 
2.1.4

Re: Possible corrupt file or patch

[Greg KH]

On Sun, Nov 20, 2016 at 01:41:46AM -0500, Walt Feasel wrote:
> I have a few files that look perfectly fine in nano and
> gedit but the patch file that gets made shows the columns
> out of alignment. I have remade them several
> times to the same effect. I have also made sure that
> there isnt a tab and space mix. Is this a bug that
> happens sometimes or do I need to do something to
> fix this?
> 
> I would really appreciate any assistance on this or
> feed back that this file does the same for others.
> 
> Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
> ---
> v2 makes changes to correct for email format patch submission
> 
>  drivers/staging/speakup/speakup_decpc.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
> index 9e16498..813461c 100644
> --- a/drivers/staging/speakup/speakup_decpc.c
> +++ b/drivers/staging/speakup/speakup_decpc.c
> @@ -75,12 +75,12 @@
>  #define	CTRL_buff_free		0x0800	/* buffer remain count */
>  #define	CTRL_buff_used		0x0900	/* buffer in use */
>  #define	CTRL_speech		0x0a00	/* immediate speech change */
> -#define	   CTRL_SP_voice	0x0001	/* voice change */
> -#define	   CTRL_SP_rate		0x0002	/* rate change */
> -#define	   CTRL_SP_comma	0x0003	/* comma pause change */
> -#define	   CTRL_SP_period	0x0004	/* period pause change */
> -#define	   CTRL_SP_rate_delta	0x0005	/* delta rate change */
> -#define	   CTRL_SP_get_param	0x0006	/* return the desired parameter */
> +#define CTRL_SP_voice		0x0001	/* voice change */
> +#define CTRL_SP_rate		0x0002	/* rate change */
> +#define CTRL_SP_comma		0x0003	/* comma pause change */
> +#define CTRL_SP_period		0x0004	/* period pause change */
> +#define CTRL_SP_rate_delta	0x0005	/* delta rate change */
> +#define CTRL_SP_get_param	0x0006	/* return the desired parameter */
>  #define	CTRL_last_index		0x0b00	/* get last index spoken */
>  #define	CTRL_io_priority	0x0c00	/* change i/o priority */
>  #define	CTRL_free_mem		0x0d00	/* get free paragraphs on module */

If you look close, there is a tab character after the "#define" and
before the "CTRL" on all of these lines, not a space.  Odds are that
nano and gedit do not show it.  If you use something like emacs or vim,
there are modes in which you can see control characters like this.

I recommend getting rid of all of the tab characters right after
"#define" as this is just a mess and causes confusion as you are seeing.

thanks,

greg k-h

Re: Possible corrupt file or patch

[Walt Feasel]

On Sun, Nov 20, 2016 at 10:50:49AM +0100, Greg KH wrote:
> On Sun, Nov 20, 2016 at 01:41:46AM -0500, Walt Feasel wrote:
> > I have a few files that look perfectly fine in nano and
> > gedit but the patch file that gets made shows the columns
> > out of alignment. I have remade them several
> > times to the same effect. I have also made sure that
> > there isnt a tab and space mix. Is this a bug that
> > happens sometimes or do I need to do something to
> > fix this?
> > 
> > I would really appreciate any assistance on this or
> > feed back that this file does the same for others.
> > 
> > Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
> > ---
> > v2 makes changes to correct for email format patch submission
> > 
> >  drivers/staging/speakup/speakup_decpc.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/staging/speakup/speakup_decpc.c b/drivers/staging/speakup/speakup_decpc.c
> > index 9e16498..813461c 100644
> > --- a/drivers/staging/speakup/speakup_decpc.c
> > +++ b/drivers/staging/speakup/speakup_decpc.c
> > @@ -75,12 +75,12 @@
> >  #define	CTRL_buff_free		0x0800	/* buffer remain count */
> >  #define	CTRL_buff_used		0x0900	/* buffer in use */
> >  #define	CTRL_speech		0x0a00	/* immediate speech change */
> > -#define	   CTRL_SP_voice	0x0001	/* voice change */
> > -#define	   CTRL_SP_rate		0x0002	/* rate change */
> > -#define	   CTRL_SP_comma	0x0003	/* comma pause change */
> > -#define	   CTRL_SP_period	0x0004	/* period pause change */
> > -#define	   CTRL_SP_rate_delta	0x0005	/* delta rate change */
> > -#define	   CTRL_SP_get_param	0x0006	/* return the desired parameter */
> > +#define CTRL_SP_voice		0x0001	/* voice change */
> > +#define CTRL_SP_rate		0x0002	/* rate change */
> > +#define CTRL_SP_comma		0x0003	/* comma pause change */
> > +#define CTRL_SP_period		0x0004	/* period pause change */
> > +#define CTRL_SP_rate_delta	0x0005	/* delta rate change */
> > +#define CTRL_SP_get_param	0x0006	/* return the desired parameter */
> >  #define	CTRL_last_index		0x0b00	/* get last index spoken */
> >  #define	CTRL_io_priority	0x0c00	/* change i/o priority */
> >  #define	CTRL_free_mem		0x0d00	/* get free paragraphs on module */
> 
> If you look close, there is a tab character after the "#define" and
> before the "CTRL" on all of these lines, not a space.  Odds are that
> nano and gedit do not show it.  If you use something like emacs or vim,
> there are modes in which you can see control characters like this.
> 
> I recommend getting rid of all of the tab characters right after
> "#define" as this is just a mess and causes confusion as you are seeing.
> 
> thanks,
> 
> greg k-h
> 
Greg,

Thanks again! I saw them in vim! Setting whitespace in nano is not done by
default I guess but have it set now. 

Walt