Strip trailing whitespace

Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change

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

12 files changed, 168 insertions, 168 deletions

diff --git a/src/XKBfileInt.h b/src/XKBfileInt.h
index 71d7834..d0e842f 100644
--- a/src/XKBfileInt.h
+++ b/src/XKBfileInt.h
@@ -9,19 +9,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/src/cout.c b/src/cout.c
index 9048031..399512f 100644
--- a/src/cout.c
+++ b/src/cout.c
@@ -6,19 +6,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/src/maprules.c b/src/maprules.c
index 29f13a4..3507852 100644
--- a/src/maprules.c
+++ b/src/maprules.c
@@ -6,19 +6,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.
 
@@ -239,7 +239,7 @@ Bool	endOfFile,spacePending,slashPending,inComment;
 #define	COMPONENT_MASK	0x03F0
 
 static	char *	cname[MAX_WORDS] = {
-	"model", "layout", "variant", "option", 
+	"model", "layout", "variant", "option",
 	"keycodes", "symbols", "types", "compat", "geometry", "keymap"
 };
 
@@ -554,7 +554,7 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
    bzero((char *)mdefs,sizeof(XkbRF_MultiDefsRec));
    mdefs->model = defs->model;
    mdefs->options = _XkbDupString(defs->options);
-   if (mdefs->options) squeeze_spaces(mdefs->options); 
+   if (mdefs->options) squeeze_spaces(mdefs->options);
 
    if (defs->layout) {
        if (!strchr(defs->layout, ',')) {
@@ -902,7 +902,7 @@ XkbRF_GetComponents(	XkbRF_RulesPtr		rules,
 
     if (names->keycodes)
 	names->keycodes= XkbRF_SubstituteVars(names->keycodes, &mdefs);
-    if (names->symbols)	
+    if (names->symbols)
 	names->symbols=	XkbRF_SubstituteVars(names->symbols, &mdefs);
     if (names->types)
 	names->types= XkbRF_SubstituteVars(names->types, &mdefs);
@@ -910,7 +910,7 @@ XkbRF_GetComponents(	XkbRF_RulesPtr		rules,
 	names->compat= XkbRF_SubstituteVars(names->compat, &mdefs);
     if (names->geometry)
 	names->geometry= XkbRF_SubstituteVars(names->geometry, &mdefs);
-    if (names->keymap)	
+    if (names->keymap)
 	names->keymap= XkbRF_SubstituteVars(names->keymap, &mdefs);
 
     FreeMultiDefs(&mdefs);
@@ -1072,7 +1072,7 @@ XkbRF_VarDescPtr	nd;
     return nd;
 }
 
-XkbRF_DescribeVarsPtr 
+XkbRF_DescribeVarsPtr
 XkbRF_AddVarToDescribe(XkbRF_RulesPtr rules,char *name)
 {
     if (rules->sz_extra<1) {
@@ -1252,14 +1252,14 @@ XkbRF_RulesPtr	rules;
 }
 
 XkbRF_RulesPtr
-XkbRF_Create(int szRules,int szExtra) 
+XkbRF_Create(int szRules,int szExtra)
 {
 XkbRF_RulesPtr rules;
 
     if ((rules=_XkbTypedCalloc(1,XkbRF_RulesRec))==NULL)
 	return NULL;
     if (szRules>0) {
-	rules->sz_rules= szRules; 
+	rules->sz_rules= szRules;
 	rules->rules= _XkbTypedCalloc(rules->sz_rules,XkbRF_RuleRec);
 	if (!rules->rules) {
 	    _XkbFree(rules);
@@ -1267,7 +1267,7 @@ XkbRF_RulesPtr rules;
 	}
     }
     if (szExtra>0) {
-	rules->sz_extra= szExtra; 
+	rules->sz_extra= szExtra;
 	rules->extra= _XkbTypedCalloc(rules->sz_extra,XkbRF_DescribeVarsRec);
 	if (!rules->extra) {
 	    if (rules->rules)
@@ -1285,7 +1285,7 @@ static void
 XkbRF_ClearVarDescriptions(XkbRF_DescribeVarsPtr var)
 {
 register int i;
-    
+
     for (i=0;i<var->num_desc;i++) {
 	if (var->desc[i].name)
 	    _XkbFree(var->desc[i].name);
@@ -1355,7 +1355,7 @@ XkbRF_GroupPtr	group;
 
 #ifndef XKB_IN_SERVER
 
-Bool 
+Bool
 XkbRF_GetNamesProp(Display *dpy,char **rf_rtrn,XkbRF_VarDefsPtr vd_rtrn)
 {
 Atom		rules_atom,actual_type;
@@ -1367,7 +1367,7 @@ Status		rtrn;
 
     rules_atom= XInternAtom(dpy,_XKB_RF_NAMES_PROP_ATOM,True);
     if (rules_atom==None)	/* property cannot exist */
-	return False; 
+	return False;
     rtrn= XGetWindowProperty(dpy,DefaultRootWindow(dpy),rules_atom,
                                 0L,_XKB_RF_NAMES_PROP_MAXLEN,False,
                                 XA_STRING,&actual_type,
@@ -1417,7 +1417,7 @@ Status		rtrn;
     return True;
 }
 
-Bool 
+Bool
 XkbRF_SetNamesProp(Display *dpy,char *rules_file,XkbRF_VarDefsPtr var_defs)
 {
 int	len,out;
diff --git a/src/srvmisc.c b/src/srvmisc.c
index 8624c1b..478d373 100644
--- a/src/srvmisc.c
+++ b/src/srvmisc.c
@@ -6,19 +6,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/src/xkbatom.c b/src/xkbatom.c
index 8abfddb..b60e90e 100644
--- a/src/xkbatom.c
+++ b/src/xkbatom.c
@@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without 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 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -53,19 +53,19 @@ SOFTWARE.
  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.
 
@@ -102,7 +102,7 @@ static NodePtr atomRoot = (NodePtr)NULL;
 static unsigned long tableLength;
 static NodePtr *nodeTable;
 
-static Atom 
+static Atom
 _XkbMakeAtom(char *string,unsigned len,Bool makeit)
 {
     register    NodePtr * np;
@@ -188,7 +188,7 @@ _XkbInitAtoms(void)
     nodeTable = (NodePtr *)_XkbAlloc(InitialTableSize*sizeof(NodePtr));
     nodeTable[None] = (NodePtr)NULL;
 }
-    
+
 /***====================================================================***/
 
 char *
diff --git a/src/xkbconfig.c b/src/xkbconfig.c
index 6e92bef..1934983 100644
--- a/src/xkbconfig.c
+++ b/src/xkbconfig.c
@@ -6,19 +6,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.
 
@@ -101,7 +101,7 @@ int	ch,nInBuf;
 		else if ( ch == '0' ) {
 		    int tmp,stop;
 		    ch = stop = 0;
-		    if (((tmp=getc(file))!=EOF) && (isdigit(tmp)) && 
+		    if (((tmp=getc(file))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -109,7 +109,7 @@ int	ch,nInBuf;
 			stop= 1;
 			ungetc(tmp,file);
 		    }
-		    if ((!stop) && ((tmp=getc(file))!=EOF) && (isdigit(tmp)) && 
+		    if ((!stop) && ((tmp=getc(file))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -117,7 +117,7 @@ int	ch,nInBuf;
 			stop= 1;
 			ungetc(tmp,file);
 		    }
-		    if ((!stop) && ((tmp=getc(file))!=EOF) && (isdigit(tmp)) && 
+		    if ((!stop) && ((tmp=getc(file))!=EOF) && (isdigit(tmp)) &&
 						(tmp!='8') && (tmp!='9')) {
 			ch= (ch*8)+(tmp-'0');
 		    }
@@ -130,7 +130,7 @@ int	ch,nInBuf;
 	    else return XkbCF_EOF;
 	}
 
-	if ( nInBuf < XKBCF_MAX_STR_LEN-1 ) 
+	if ( nInBuf < XKBCF_MAX_STR_LEN-1 )
 	    _XkbCF_rtrn[nInBuf++] = ch;
     }
     if ( ch == quote ) {
@@ -155,7 +155,7 @@ int	i;
     return XkbCF_Unknown;
 }
 
-int 
+int
 XkbCFScan(FILE *file,XkbCFScanResultPtr val_rtrn,XkbConfigRtrnPtr rtrn)
 {
 int	ch;
@@ -220,7 +220,7 @@ int	ch;
 #define	_XkbCF_Layout			10
 #define	_XkbCF_Variant			11
 #define	_XkbCF_Options			12
-	
+
 #define	_XkbCF_InitialMods	 	13
 #define	_XkbCF_InitialCtrls	 	14
 
@@ -732,7 +732,7 @@ unsigned		what;
 		}
 	    }
 	    break;
-	case _XkbCF_ClickVolume:	
+	case _XkbCF_ClickVolume:
 	    if (!pival) {
 		pival= &rtrn->click_volume;
 		onoff= 100;
@@ -752,31 +752,31 @@ unsigned		what;
 	    if (!pival)
 		pival= &rtrn->repeat_delay;
 	case _XkbCF_RepeatInterval:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->repeat_interval;
 	case _XkbCF_SlowKeysDelay:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->slow_keys_delay;
 	case _XkbCF_DebounceDelay:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->debounce_delay;
 	case _XkbCF_MouseKeysDelay:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->mk_delay;
 	case _XkbCF_MouseKeysInterval:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->mk_interval;
 	case _XkbCF_MouseKeysTimeToMax:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->mk_time_to_max;
 	case _XkbCF_MouseKeysMaxSpeed:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->mk_max_speed;
 	case _XkbCF_MouseKeysCurve:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->mk_curve;
 	case _XkbCF_AccessXTimeout:
-	    if (!pival) 
+	    if (!pival)
 		pival= &rtrn->ax_timeout;
 	    if (tok!=XkbCF_Equals) {
 		rtrn->error= XkbCF_MissingEquals;
@@ -852,7 +852,7 @@ unsigned		what;
 	default:
 	    rtrn->error= XkbCF_ExpectedInteger;
 	    goto BAILOUT;
-	    
+
     }
     return True;
 BAILOUT:
@@ -1171,7 +1171,7 @@ XkbConfigFieldsPtr	pNew;
     return pNew;
 }
 
-XkbConfigFieldsPtr 
+XkbConfigFieldsPtr
 XkbCFFree(XkbConfigFieldsPtr fields,Bool all)
 {
 XkbConfigFieldsPtr	next;
diff --git a/src/xkbdraw.c b/src/xkbdraw.c
index c9bcafc..179dc74 100644
--- a/src/xkbdraw.c
+++ b/src/xkbdraw.c
@@ -6,19 +6,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/src/xkbmisc.c b/src/xkbmisc.c
index a74d978..314580e 100644
--- a/src/xkbmisc.c
+++ b/src/xkbmisc.c
@@ -6,19 +6,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.
 
@@ -323,7 +323,7 @@ XkbFileInfo	finfo;
 	    else {
 		wantDflts|= XkmTypesMask;
 	    }
-	    complete|= XkmTypesMask; 
+	    complete|= XkmTypesMask;
 	}
 	if (wantNames&XkmCompatMapMask) {
 	    if (old_names->compat!=None) {
@@ -331,14 +331,14 @@ XkbFileInfo	finfo;
 		names->compat= tmp;
 	    }
 	    else wantDflts|= XkmCompatMapMask;
-	    complete|= XkmCompatMapMask; 
+	    complete|= XkmCompatMapMask;
 	}
 	if (wantNames&XkmSymbolsMask) {
 	    if (old_names->symbols==None)
 		return False;
 	    tmp= XkbAtomGetString(dpy,old_names->symbols);
 	    names->symbols= tmp;
-	    complete|= XkmSymbolsMask; 
+	    complete|= XkmSymbolsMask;
 	}
 	if (wantNames&XkmKeyNamesMask) {
 	   if (old_names->keycodes!=None) {
@@ -353,7 +353,7 @@ XkbFileInfo	finfo;
 		return False;
 	    tmp= XkbAtomGetString(dpy,old_names->geometry);
 	    names->geometry= tmp;
-	    complete|= XkmGeometryMask; 
+	    complete|= XkmGeometryMask;
 	    wantNames&= ~XkmGeometryMask;
 	}
     }
@@ -519,7 +519,7 @@ unsigned	rtrn;
 		rtrn|= XkbCompatMapMask|XkbIndicatorMapMask;
 	if (orig&XkmSymbolsMask)	rtrn|=XkbClientMapMask|XkbServerMapMask;
 	if (orig&XkmIndicatorsMask)	rtrn|= XkbIndicatorMapMask;
-	if (orig&XkmKeyNamesMask)	
+	if (orig&XkmKeyNamesMask)
 		rtrn|= XkbNamesMask|XkbIndicatorMapMask;
 	if (orig&XkmGeometryMask)	rtrn|= XkbGeometryMask;
     }
@@ -547,7 +547,7 @@ XkbDescPtr	xkb;
     if (!present)
 	return False;
     else switch (present) {
-	case XkmKeyNamesMask:	
+	case XkmKeyNamesMask:
 	    finfo->type= 	XkmKeyNamesIndex;
 	    finfo->defined= 	present;
 	    return True;
@@ -555,18 +555,18 @@ XkbDescPtr	xkb;
 	    finfo->type=	XkmTypesIndex;
 	    finfo->defined= 	present;
 	    return True;
-	case XkmCompatMapMask:	
+	case XkmCompatMapMask:
 	    finfo->type=	XkmCompatMapIndex;
 	    finfo->defined=	present;
 	    return True;
-	case XkmSymbolsMask:	
+	case XkmSymbolsMask:
 	    if (format!=XkbXKMFile) {
 		finfo->type= 	XkmSymbolsIndex;
 		finfo->defined=	present;
 		return True;
 	    }
 	    break;
-	case XkmGeometryMask:	
+	case XkmGeometryMask:
 	    finfo->type=	XkmGeometryIndex;
 	    finfo->defined=	present;
 	    return True;
@@ -662,7 +662,7 @@ _X_HIDDEN int
 _XkbStrCaseCmp(char *str1,char *str2)
 {
     const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
-    
+
     while (tolower(*us1) == tolower(*us2)) {
         if (*us1++ == '\0')
             return (0);
diff --git a/src/xkbout.c b/src/xkbout.c
index caf5999..ad1fd03 100644
--- a/src/xkbout.c
+++ b/src/xkbout.c
@@ -6,19 +6,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.
 
@@ -221,7 +221,7 @@ XkbDescPtr		xkb;
 								XkbXKBFile));
 	entry= type->map;
 	for (n=0;n<type->map_count;n++,entry++) {
-	    char *str;	
+	    char *str;
 	    str=XkbVModMaskText(dpy,xkb,entry->mods.real_mods,entry->mods.vmods,
 								XkbXKBFile);
 	    fprintf(file,"        map[%s]= Level%d;\n",str,entry->level+1);
@@ -328,7 +328,7 @@ XkbDescPtr		xkb;
     fprintf(file,"    interpret.locking= False;\n");
     interp= xkb->compat->sym_interpret;
     for (i=0;i<xkb->compat->num_si;i++,interp++) {
-	fprintf(file,"    interpret %s+%s(%s) {\n",	
+	fprintf(file,"    interpret %s+%s(%s) {\n",
 				((interp->sym==NoSymbol)?"Any":
 					XkbKeysymText(interp->sym,XkbXKBFile)),
 				XkbSIMatchText(interp->match,XkbXKBFile),
@@ -512,7 +512,7 @@ Bool			showActions;
 	    ((srv->explicit[i]&XkbExplicitInterpretMask)!=0))
 	     showActions= XkbKeyHasActions(xkb,i);
 	else showActions= False;
-	
+
 	if (((unsigned)XkbKeyNumGroups(xkb,i)>1)||showActions)
 	    simple= False;
 	if (simple) {
diff --git a/src/xkbtext.c b/src/xkbtext.c
index 712ba96..3eabb5d 100644
--- a/src/xkbtext.c
+++ b/src/xkbtext.c
@@ -6,19 +6,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.
 
@@ -199,7 +199,7 @@ char *str,buf[BUFFER_SIZE];
 	str= buf;
     }
     else str= NULL;
-    if (mm)	
+    if (mm)
 	len= strlen(mm);
     else	len= 0;
     if (str)
@@ -737,14 +737,14 @@ char *	buf;
 }
 
 static char *actionTypeNames[XkbSA_NumActions]= {
-    "NoAction", 
-    "SetMods",      "LatchMods",    "LockMods", 
+    "NoAction",
+    "SetMods",      "LatchMods",    "LockMods",
     "SetGroup",     "LatchGroup",   "LockGroup",
     "MovePtr",
     "PtrBtn",       "LockPtrBtn",
     "SetPtrDflt",
     "ISOLock",
-    "Terminate",    "SwitchScreen", 
+    "Terminate",    "SwitchScreen",
     "SetControls",  "LockControls",
     "ActionMessage",
     "RedirectKey",
diff --git a/src/xkmout.c b/src/xkmout.c
index 79d86ef..1e43157 100644
--- a/src/xkmout.c
+++ b/src/xkmout.c
@@ -6,19 +6,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.
 
@@ -241,7 +241,7 @@ unsigned	tmp,size= 0;
     dpy= xkb->dpy;
     kcName= xkb->names->keycodes;
     start= xkb->names->keys[xkb->min_key_code].name;
-    
+
     size+= xkmPutCountedString(file,XkbAtomGetString(dpy,kcName));
     size+= xkmPutCARD8(file,xkb->min_key_code);
     size+= xkmPutCARD8(file,xkb->max_key_code);
@@ -660,7 +660,7 @@ register unsigned	i,nLEDs;
 	    if ((map->flags!=0)||(map->which_groups!=0)||(map->groups!=0)||
 		(map->which_mods!=0)||
 		(map->mods.real_mods!=0)||(map->mods.vmods!=0)||
-		(map->ctrls!=0) || 
+		(map->ctrls!=0) ||
 		(xkb->names && (xkb->names->indicators[i]!=None))) {
 		char *name;
 		if (xkb->names && xkb->names->indicators[i]!=None) {
@@ -938,7 +938,7 @@ unsigned		tmp,size= 0;
 	    size+= tmp*SIZEOF(xkmOverlayKeyDesc);
 	}
     }
-    return size;    
+    return size;
 }
 
 static unsigned
@@ -1259,7 +1259,7 @@ WriteXKMFile(	FILE *		file,
 {
 register int 	i;
 unsigned	tmp,size,total= 0;
-    
+
     for (i=0;i<num_toc;i++) {
 	tmp= fwrite(&toc[i],SIZEOF(xkmSectionInfo),1,file);
 	total+= tmp*SIZEOF(xkmSectionInfo);
diff --git a/src/xkmread.c b/src/xkmread.c
index ae05661..5df95aa 100644
--- a/src/xkmread.c
+++ b/src/xkmread.c
@@ -6,19 +6,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.
 
@@ -302,7 +302,7 @@ XkbDescPtr		xkb;
     if ((tmp= XkmGetCountedString(file,buf,100))<1) {
 	_XkbLibError(_XkbErrBadLength,"ReadXkmKeyTypes",0);
 	return -1;
-    }	
+    }
     nRead+= tmp;
     if (buf[0]!='\0') {
 	if (XkbAllocNames(xkb,XkbTypesNameMask,0,0)!=Success) {
@@ -624,7 +624,7 @@ XkbDescPtr		xkb;
 		Atom name;
 		name= XkbInternAtom(xkb->dpy,buf,0);
 		xkb->names->groups[i]= name;
-	    }	
+	    }
 	    else xkb->names->groups[i]= None;
 	}
     }
@@ -689,7 +689,7 @@ XkbDescPtr		xkb;
 	if (XkbNumGroups(wireMap.num_groups)>0) {
 	    KeySym	*sym;
 	    int		 nSyms;
-	
+
 	    if (XkbNumGroups(wireMap.num_groups)>xkb->ctrls->num_groups)
 		xkb->ctrls->num_groups= wireMap.num_groups;
 	    nSyms= XkbNumGroups(wireMap.num_groups)*wireMap.width;