Lift XKB*.c to libX11 1.3.4

1 files changed, 21 insertions, 21 deletions

diff --git a/nx-X11/lib/X11/XKBGAlloc.c b/nx-X11/lib/X11/XKBGAlloc.c
index f5e6737af..46b997b7f 100644
--- a/nx-X11/lib/X11/XKBGAlloc.c
+++ b/nx-X11/lib/X11/XKBGAlloc.c
@@ -6,19 +6,19 @@ 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 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.
 
@@ -38,7 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/extensions/XKBgeom.h>
 #include <nx-X11/extensions/XKBproto.h>
 
-#else 
+#else
 
 #include <stdio.h>
 #include <nx-X11/X.h>
@@ -58,7 +58,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /***====================================================================***/
 
-static void 
+static void
 _XkbFreeGeomLeafElems(	Bool			freeAll,
 			int			first,
 			int 			count,
@@ -72,14 +72,14 @@ _XkbFreeGeomLeafElems(	Bool			freeAll,
 	if (*elems!=NULL) {
 	    _XkbFree(*elems);
 	    *elems= NULL;
-	}	
+	}
 	return;
     }
 
     if ((first>=(*num_inout))||(first<0)||(count<1))
 	return;
 
-    if (first+count>=(*num_inout)) { 
+    if (first+count>=(*num_inout)) {
 	/* truncating the array is easy */
 	(*num_inout)= first;
     }
@@ -99,7 +99,7 @@ typedef void (*ContentsClearFunc)(
 		char *		/* priv */
 );
 
-static void 
+static void
 _XkbFreeGeomNonLeafElems(	Bool			freeAll,
 				int			first,
 				int 			count,
@@ -187,7 +187,7 @@ XkbFreeGeomKeyAliases(	XkbGeometryPtr	geom,
 			int		first,
 			int		count,
 			Bool		freeAll)
-{	
+{
     _XkbFreeGeomLeafElems(freeAll,first,count,
 				&geom->num_key_aliases,&geom->sz_key_aliases,
 				(char **)&geom->key_aliases,
@@ -248,7 +248,7 @@ XkbFreeGeomOutlines(XkbShapePtr	shape,int first,int count,Bool freeAll)
 				&shape->num_outlines,&shape->sz_outlines,
 				(char **)&shape->outlines,
 				sizeof(XkbOutlineRec),_XkbClearOutline);
-	
+
     return;
 }
 
@@ -276,7 +276,7 @@ XkbFreeGeomShapes(XkbGeometryPtr geom,int first,int count,Bool freeAll)
 
 /***====================================================================***/
 
-void 
+void
 XkbFreeGeomOverlayKeys(XkbOverlayRowPtr row,int first,int count,Bool freeAll)
 {
     _XkbFreeGeomLeafElems(freeAll,first,count,
@@ -397,7 +397,7 @@ _XkbClearDoodad(char *doodad_in)
 XkbDoodadPtr	doodad= (XkbDoodadPtr)doodad_in;
 
     switch (doodad->any.type) {
-   	case XkbTextDoodad: 
+   	case XkbTextDoodad:
 	    {
 		if (doodad->text.text!=NULL) {
 		    _XkbFree(doodad->text.text);
@@ -409,7 +409,7 @@ XkbDoodadPtr	doodad= (XkbDoodadPtr)doodad_in;
 		}
 	    }
 	    break;
-   	case XkbLogoDoodad: 
+   	case XkbLogoDoodad:
 	    {
 		if (doodad->logo.logo_name!=NULL) {
 		    _XkbFree(doodad->logo.logo_name);
@@ -542,7 +542,7 @@ _XkbGeomAlloc(	XPointer *		old,
 #define	_XkbAllocOverlayKeys(r,n) _XkbGeomAlloc((XPointer *)&(r)->keys,\
 				&(r)->num_keys,&(r)->sz_keys,\
 				(n),sizeof(XkbOverlayKeyRec))
-    
+
 Status
 XkbAllocGeomProps(XkbGeometryPtr geom,int nProps)
 {
@@ -688,7 +688,7 @@ register XkbPropertyPtr prop;
 	    if (prop->value)
 		strcpy(prop->value,value);
 	    return prop;
-	}    
+	}
     }
     if ((geom->num_properties>=geom->sz_properties)&&
 					(_XkbAllocProps(geom,1)!=Success)) {
@@ -945,7 +945,7 @@ Bool		found;
 	}
     }
     if (!found)
-   	return NULL; 
+   	return NULL;
     if ((row->num_keys>=row->sz_keys)&&(_XkbAllocOverlayKeys(row,1)!=Success))
 	return NULL;
     key= &row->keys[row->num_keys];