From b1e3db243eb118b4b2eb483df4a9ad19dcee17d0 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri, 16 Sep 2011 22:15:10 -0700
Subject: 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>
---
 src/Makefile.am  |  8 ++++----
 src/Xcomposite.c | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 456bb88..0efe173 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-# 
+#
 #  Copyright © 2003 Keith Packard, Noah Levitt
-# 
+#
 #  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
@@ -10,7 +10,7 @@
 #  specific, written prior permission.  Keith Packard makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -33,4 +33,4 @@ libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS)
 libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 
 libXcompositeincludedir = $(includedir)/X11/extensions
-libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h 
+libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index eaa1790..9402339 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -52,7 +52,7 @@ const char XCompositeExtensionName[] = COMPOSITE_NAME;
  * XCompositeExtRemoveDisplay - remove the indicated display from the
  * extension object. (Replaces XextRemoveDisplay.)
  */
-static int 
+static int
 XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, Display *dpy)
 {
     XCompositeExtDisplayInfo *info, *prev;
@@ -111,13 +111,13 @@ XCompositeExtAddDisplay (XCompositeExtInfo	*extinfo,
     info->codes = XInitExtension (dpy, ext_name);
 
     /*
-     * if the server has the extension, then we can initialize the 
+     * if the server has the extension, then we can initialize the
      * appropriate function vectors
      */
     if (info->codes) {
 	xCompositeQueryVersionReply	rep;
 	xCompositeQueryVersionReq	*req;
-        XESetCloseDisplay (dpy, info->codes->extension, 
+        XESetCloseDisplay (dpy, info->codes->extension,
                            XCompositeCloseDisplay);
 	/*
 	 * Get the version info
@@ -128,7 +128,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo	*extinfo,
 	req->compositeReqType = X_CompositeQueryVersion;
 	req->majorVersion = COMPOSITE_MAJOR;
 	req->minorVersion = COMPOSITE_MINOR;
-	if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+	if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
 	{
 	    UnlockDisplay (dpy);
 	    SyncHandle ();
@@ -171,7 +171,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo	*extinfo,
  * XextFindDisplay.)
  */
 static XCompositeExtDisplayInfo *
-XCompositeExtFindDisplay (XCompositeExtInfo *extinfo, 
+XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
 		      Display	    *dpy)
 {
     XCompositeExtDisplayInfo *info;
@@ -179,7 +179,7 @@ XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
     /*
      * see if this was the most recently accessed display
      */
-    if ((info = extinfo->cur) && info->display == dpy) 
+    if ((info = extinfo->cur) && info->display == dpy)
 	return info;
 
     /*
@@ -205,30 +205,30 @@ XCompositeFindDisplay (Display *dpy)
 
     info = XCompositeExtFindDisplay (&XCompositeExtensionInfo, dpy);
     if (!info)
-	info = XCompositeExtAddDisplay (&XCompositeExtensionInfo, dpy, 
+	info = XCompositeExtAddDisplay (&XCompositeExtensionInfo, dpy,
 				    XCompositeExtensionName);
     return info;
 }
-    
 
-Bool 
+
+Bool
 XCompositeQueryExtension (Display *dpy,
 			  int *event_base_return,
 			  int *error_base_return)
 {
     XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
 
-    if (XCompositeHasExtension(info)) 
+    if (XCompositeHasExtension(info))
     {
 	*event_base_return = info->codes->first_event;
 	*error_base_return = info->codes->first_error;
 	return True;
-    } 
+    }
     else
 	return False;
 }
 
-Status 
+Status
 XCompositeQueryVersion (Display *dpy,
 		    int	    *major_version_return,
 		    int	    *minor_version_return)
@@ -372,7 +372,7 @@ XCompositeGetOverlayWindow (Display *dpy, Window window)
 	SyncHandle ();
 	return 0;
     }
-   
+
     UnlockDisplay (dpy);
     SyncHandle ();
 
-- 
cgit v1.2.1