Remove trailing whitespace

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

12 files changed, 118 insertions, 118 deletions

diff --git a/Makefile.am b/Makefile.am
index ea10e5f..949411a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 #  Copyright 2005  Red Hat, Inc.
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@
 #  specific, written prior permission.  Red Hat makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/cfgparse.y b/cfgparse.y
index 05632df..e30780f 100644
--- a/cfgparse.y
+++ b/cfgparse.y
@@ -7,19 +7,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -90,7 +90,7 @@ CfgFile		:	CfgEntryList
 		;
 
 CfgEntryList	:	CfgEntryList CfgEntry
-			{ 
+			{
 			    CfgEntryPtr tmp;
 			    if ($1!=NULL) {
 				for (tmp=$1;tmp->next!=NULL;tmp=tmp->next) {
@@ -155,14 +155,14 @@ EventType	:	BELL		{ $$= XkbBellNotify; }
 		;
 
 ActionDef	:	ActionType OptString
-			{ 
+			{
 			    ActDefPtr act;
 			    act= uTypedCalloc(1,ActDefRec);
 			    if (act) {
 				act->type= $1;
 				act->text= $2;
 			    }
-			    $$= act; 
+			    $$= act;
 			}
 		;
 
diff --git a/cfgscan.c b/cfgscan.c
index 4f9ea20..a10ca95 100644
--- a/cfgscan.c
+++ b/cfgscan.c
@@ -7,19 +7,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -136,7 +136,7 @@ int ch;
 		else if ( ch == '0' ) {
 		    int tmp,stop;
 		    ch = stop = 0;
-		    if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) && 
+		    if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -144,7 +144,7 @@ int ch;
 			stop= 1;
 			ungetc(tmp,yyin);
 		    }
-		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) && 
+		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -152,7 +152,7 @@ int ch;
 			stop= 1;
 			ungetc(tmp,yyin);
 		    }
-		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) && 
+		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -165,7 +165,7 @@ int ch;
 	    else return ERROR;
 	}
 
-	if ( nInBuf < BUFSIZE-1 ) 
+	if ( nInBuf < BUFSIZE-1 )
 	    buf[nInBuf++] = ch;
     }
     if ( ch == '"' ) {
@@ -198,7 +198,7 @@ int ch;
 		else if ( ch == '0' ) {
 		    int tmp,stop;
 		    ch = stop = 0;
-		    if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) && 
+		    if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -206,7 +206,7 @@ int ch;
 			stop= 1;
 			ungetc(tmp,yyin);
 		    }
-		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) && 
+		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -214,7 +214,7 @@ int ch;
 			stop= 1;
 			ungetc(tmp,yyin);
 		    }
-		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) && 
+		    if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -227,7 +227,7 @@ int ch;
 	    else return ERROR;
 	}
 
-	if ( nInBuf < BUFSIZE-1 ) 
+	if ( nInBuf < BUFSIZE-1 )
 	    buf[nInBuf++] = ch;
     }
     if (( ch == '>' )&&(nInBuf<5)) {
@@ -332,7 +332,7 @@ yylex(void)
 {
 int	ch;
 int	rtrn;
-    
+
     do {
 	ch = getc(yyin);
 	if ( ch == '\n' ) {
diff --git a/configure.ac b/configure.ac
index 5487fd1..254d61d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl  Copyright 2005 Red Hat, Inc.
-dnl 
+dnl
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
 dnl  documentation for any purpose is hereby granted without fee, provided that
 dnl  the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@ dnl  advertising or publicity pertaining to distribution of the software without
 dnl  specific, written prior permission.  Red Hat makes no
 dnl  representations about the suitability of this software for any purpose.  It
 dnl  is provided "as is" without express or implied warranty.
-dnl 
+dnl
 dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/evargs.c b/evargs.c
index 44b8242..08c4a64 100644
--- a/evargs.c
+++ b/evargs.c
@@ -7,19 +7,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -76,7 +76,7 @@ AppendActionMessageArg(char *sink, char *arg, XkbEvent *ev)
 {
     if (uStringEqual(arg,"device")||uStringEqual(arg,"D"))
 	sprintf(sink,"%d",ev->message.device);
-    else if (uStringEqual(arg,"message")||uStringEqual(arg,"m")) 
+    else if (uStringEqual(arg,"message")||uStringEqual(arg,"m"))
 	sprintf(sink,"%s",ev->message.message);
     else if (uStringEqual(arg,"keycode")||uStringEqual(arg,"key")||
 						  uStringEqual(arg,"k"))
diff --git a/printev.c b/printev.c
index 1aec0aa..445f9fe 100644
--- a/printev.c
+++ b/printev.c
@@ -7,19 +7,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -153,7 +153,7 @@ static void
 do_XkbIndicatorNotify(FILE *file, XkbEvent *xkbev)
 {
     XkbIndicatorNotifyEvent *leds = &xkbev->indicators;
-    if (leds->xkb_type==XkbIndicatorStateNotify) 
+    if (leds->xkb_type==XkbIndicatorStateNotify)
 	 fprintf(file,"    state changes= 0x%08x, new state= 0x%08x\n",
 					leds->changed,leds->state);
     else fprintf(file,"    map changes= 0x%08x, state= 0x%08x\n",
@@ -391,7 +391,7 @@ do_ButtonPress(XkbEvent *eventp)
     printf ("    root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
 	    e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
     printf ("    state 0x%x, group= %d, button %u, same_screen %s\n",
-	    e->state&0x1FFF, (e->state>>13)&0x7, e->button, 
+	    e->state&0x1FFF, (e->state>>13)&0x7, e->button,
 	    ynText(e->same_screen));
 
     return;
@@ -412,7 +412,7 @@ do_MotionNotify(XkbEvent *eventp)
     printf ("    root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
 	    e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
     printf ("    state 0x%x, group= %d, is_hint %u, same_screen %s\n",
-	    e->state&0x1FFF, (e->state>>13)&0x7, e->is_hint, 
+	    e->state&0x1FFF, (e->state>>13)&0x7, e->is_hint,
 	    ynText(e->same_screen));
 
     return;
diff --git a/tokens.h b/tokens.h
index c0b9d97..c398143 100644
--- a/tokens.h
+++ b/tokens.h
@@ -7,19 +7,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/utils.c b/utils.c
index 8456fd2..0e0479d 100644
--- a/utils.c
+++ b/utils.c
@@ -9,8 +9,8 @@
    *
    * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
    * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE 
-   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED 
+   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
    * WARRANTY.
    *
    * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -22,7 +22,7 @@
    * that the above copyright notice appear in all copies and that both that
    * copyright notice and this permission notice appear in supporting
    * documentation, and that the name of Digital Equipment Corporation not be
-   * used in advertising or publicity pertaining to distribution of the 
+   * used in advertising or publicity pertaining to distribution of the
    * software without specific, written prior permission.
   \*/
 /* $Xorg: utils.c,v 1.5 2000/08/17 19:54:49 cpqbld Exp $ */
diff --git a/utils.h b/utils.h
index 1f4f517..c72c312 100644
--- a/utils.h
+++ b/utils.h
@@ -11,8 +11,8 @@
    *
    * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
    * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE 
-   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED 
+   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
    * WARRANTY.
    *
    * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -24,7 +24,7 @@
    * that the above copyright notice appear in all copies and that both that
    * copyright notice and this permission notice appear in supporting
    * documentation, and that the name of Digital Equipment Corporation not be
-   * used in advertising or publicity pertaining to distribution of the 
+   * used in advertising or publicity pertaining to distribution of the
    * software without specific, written prior permission.
   \*/
 /* $XFree86: xc/programs/xkbevd/utils.h,v 1.6 2002/01/14 18:30:11 dawes Exp $ */
@@ -79,7 +79,7 @@ typedef union {
 	int		 i;
 	unsigned	 u;
 	void		*p;
-	void		*(*fp)(); 
+	void		*(*fp)();
 } Union;
 #endif
 
@@ -272,7 +272,7 @@ extern	int	uEntryLevel;
 #define	uFLAG_ENTRY7(f,s,a,b,c,d,e,g,h)
 #define	uFLAG_RETURN(v)			{ return(v);}
 #define	uFLAG_VOIDRETURN		{ return; }
-#endif 
+#endif
 
 _XFUNCPROTOEND
 
diff --git a/xkbevd.c b/xkbevd.c
index 1a4dfb6..fa260d2 100644
--- a/xkbevd.c
+++ b/xkbevd.c
@@ -7,19 +7,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -116,7 +116,7 @@ register int i;
 	    else {
 		char *name= argv[++i];
 		if (cfgFileName!=NULL) {
-		    if (uStringEqual(cfgFileName,name)) 
+		    if (uStringEqual(cfgFileName,name))
 			uWarning("Config file \"%s\" specified twice!\n");
 		    else {
 			uWarning("Multiple config files on command line\n");
@@ -135,7 +135,7 @@ register int i;
 	    else {
 		char *name= argv[++i];
 		if (dpyName!=NULL) {
-		    if (uStringEqual(dpyName,name)) 
+		    if (uStringEqual(dpyName,name))
 			uWarning("Display \"%s\" specified twice!\n");
 		    else {
 			uWarning("Multiple displays on command line\n");
@@ -154,7 +154,7 @@ register int i;
 	    else {
 		char *name= argv[++i];
 		if (soundCmd!=NULL) {
-		    if (uStringEqual(soundCmd,name)) 
+		    if (uStringEqual(soundCmd,name))
 			uWarning("Sound command \"%s\" specified twice!\n");
 		    else {
 			uWarning("Multiple sound commands on command line\n");
@@ -173,7 +173,7 @@ register int i;
 	    else {
 		char *name= argv[++i];
 		if (soundDir!=NULL) {
-		    if (uStringEqual(soundDir,name)) 
+		    if (uStringEqual(soundDir,name))
 			uWarning("Sound directory \"%s\" specified twice!\n");
 		    else {
 			uWarning("Multiple sound dirs on command line\n");
@@ -289,9 +289,9 @@ unsigned	priv= 0;
 		break;
 	    case XkbAccessXNotify:
 		priv= 0;
-		if (name==NULL)		
+		if (name==NULL)
 		     priv= XkbAllNewKeyboardEventsMask;
-		else if (uStrCaseEqual(name,"skpress"))	
+		else if (uStrCaseEqual(name,"skpress"))
 		     priv= XkbAXN_SKPressMask;
 		else if (uStrCaseEqual(name,"skaccept"))
 		     priv= XkbAXN_SKAcceptMask;
@@ -498,7 +498,7 @@ Bool		ok;
 
     if (background) {
 	if (fork()!=0) {
-	    if (verbose) 
+	    if (verbose)
 		uInformation("Running in the background\n");
 	    exit(0);
 	}
diff --git a/xkbevd.h b/xkbevd.h
index f7e9241..8ac0514 100644
--- a/xkbevd.h
+++ b/xkbevd.h
@@ -7,19 +7,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/xkbevd.man b/xkbevd.man
index ec235f3..638b867 100644
--- a/xkbevd.man
+++ b/xkbevd.man
@@ -11,29 +11,29 @@ xkbevd \- XKB event daemon
 [ options ]
 .SH DESCRIPTION
 .PP
-This command is very raw and is therefore only partially implemented;  we 
-present it here as a rough prototype for developers, not as a general purpose 
+This command is very raw and is therefore only partially implemented;  we
+present it here as a rough prototype for developers, not as a general purpose
 tool for end users.  Something like this might make a suitable replacement
 for xev;  I'm not signing up, mind you, but it's an interesting idea.
 .PP
 The
 .I xkbevd
 event daemon listens for specified XKB events and executes requested commands
-if they occur.   The configuration file consists of a list of event 
-specification/action pairs and/or variable definitions.   
+if they occur.   The configuration file consists of a list of event
+specification/action pairs and/or variable definitions.
 .PP
-An event specification consists of a short XKB event name followed by a 
-string or identifier which serves as a qualifier in parentheses;  empty 
-parenthesis indicate no qualification and serve to specify the default 
-command which is applied to events which do not match any of the other 
-specifications.  The interpretation of the qualifier depends on the type 
-of the event:  Bell events match using the name of the bell, message events 
-match on the contents of the message string and slow key events accept 
-any of \fIpress\fP, \fIrelease\fP, \fIaccept\fP, or \fIreject\fP.   No 
+An event specification consists of a short XKB event name followed by a
+string or identifier which serves as a qualifier in parentheses;  empty
+parenthesis indicate no qualification and serve to specify the default
+command which is applied to events which do not match any of the other
+specifications.  The interpretation of the qualifier depends on the type
+of the event:  Bell events match using the name of the bell, message events
+match on the contents of the message string and slow key events accept
+any of \fIpress\fP, \fIrelease\fP, \fIaccept\fP, or \fIreject\fP.   No
 other events are currently recognized.
 .PP
-An action consists of an optional keyword followed by an optional string 
-argument.  Currently, \fIxkbev\fP recognizes the actions: \fInone\fP, 
+An action consists of an optional keyword followed by an optional string
+argument.  Currently, \fIxkbev\fP recognizes the actions: \fInone\fP,
 \fIignore\fP, \fIecho\fP, \fIprintEvent\fP, \fIsound\fP, and \fIshell\fP.
 If the action is not specified, the string is taken as the name of a sound
 file to be played unless it begins with an exclamation point, in which case
@@ -41,12 +41,12 @@ it is taken as a shell command.
 .PP
 Variable definitions in the argument string are expanded with fields from
 the event in question before the argument string is passed to the action
-processor.   The general syntax for a variable is 
+processor.   The general syntax for a variable is
 either $\fIc\P or $(\fIstr\fP), where \fIc\fP is a single character and
-\fIstr\fP is a string of arbitrary length.  All parameters have both 
-single-character and long names.    
+\fIstr\fP is a string of arbitrary length.  All parameters have both
+single-character and long names.
 .PP
-The list of recognized parameters varies from event to event and is too long 
+The list of recognized parameters varies from event to event and is too long
 to list here right now.   This is a developer release anyway, so you can
 be expected to look at the source code (evargs.c is of particular interest).
 .PP
@@ -54,7 +54,7 @@ The \fIignore\fP, \fIecho\fP, \fIprintEvent\fP, \fIsound\fP,and \fIshell\fP
 actions do what you would expect commands named \fIignore\fP, \fIecho\fP,
 \fIprintEvent\fP, \fIsound\fP, and \fIshell\fP to do, except that the sound
 command has only been implemented and tested for SGI machines.   It launches
-an external program right now, so it should be pretty easy to adapt, 
+an external program right now, so it should be pretty easy to adapt,
 especially if you like audio cues that arrive about a half-second after you
 expect them.
 .PP
@@ -87,7 +87,7 @@ Tells \fIxkbevd\fP to fork itself (and run in the background).
 Forces synchronization of all X requests.  Slow.
 .TP 8
 .B \-v
-Print more information, including debugging messages.   Multiple 
+Print more information, including debugging messages.   Multiple
 specifications of \fI-v\fP cause more output, to a point.
 .SH "SEE ALSO"
 X(__miscmansuffix__)