summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:16:01 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:16:01 -0700
commit665c80d7af5fc7a73b76e0ddaee3536b37b029e9 (patch)
tree4e7eb4d3ca15c465432b5f704afc368ce90cede8
parent45e9544d8202b76e20923f4d84667879a3d185ec (diff)
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>
-rw-r--r--Makefile.am6
-rw-r--r--include/X11/extensions/Xdamage.h2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Xdamage.c28
4 files changed, 19 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index 0e317a5..b107025 100644
--- a/Makefile.am
+++ b/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
diff --git a/include/X11/extensions/Xdamage.h b/include/X11/extensions/Xdamage.h
index 5ecf035..b3a5a06 100644
--- a/include/X11/extensions/Xdamage.h
+++ b/include/X11/extensions/Xdamage.h
@@ -62,7 +62,7 @@ void
XDamageDestroy (Display *dpy, Damage damage);
void
-XDamageSubtract (Display *dpy, Damage damage,
+XDamageSubtract (Display *dpy, Damage damage,
XserverRegion repair, XserverRegion parts);
void
diff --git a/src/Makefile.am b/src/Makefile.am
index 787fc04..0027895 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,4 +12,4 @@ INCLUDES = -I$(top_srcdir)/include/X11/extensions
libXdamage_la_LDFLAGS = -version-number 1:1:0 -no-undefined
libXdamageincludedir = $(includedir)/X11/extensions
-libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h
+libXdamageinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xdamage.h
diff --git a/src/Xdamage.c b/src/Xdamage.c
index 3a368d2..dc0044d 100644
--- a/src/Xdamage.c
+++ b/src/Xdamage.c
@@ -32,7 +32,7 @@ const char XDamageExtensionName[] = DAMAGE_NAME;
static int
XDamageCloseDisplay (Display *dpy, XExtCodes *codes);
-
+
static Bool
XDamageWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
@@ -58,13 +58,13 @@ XDamageExtAddDisplay (XDamageExtInfo *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) {
xDamageQueryVersionReply rep;
xDamageQueryVersionReq *req;
- XESetCloseDisplay (dpy, info->codes->extension,
+ XESetCloseDisplay (dpy, info->codes->extension,
XDamageCloseDisplay);
for (ev = info->codes->first_event;
ev < info->codes->first_event + XDamageNumberEvents;
@@ -82,7 +82,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo,
req->damageReqType = X_DamageQueryVersion;
req->majorVersion = DAMAGE_MAJOR;
req->minorVersion = DAMAGE_MINOR;
- if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
{
UnlockDisplay (dpy);
SyncHandle ();
@@ -124,7 +124,7 @@ XDamageExtAddDisplay (XDamageExtInfo *extinfo,
* XDamageExtRemoveDisplay - remove the indicated display from the
* extension object. (Replaces XextRemoveDisplay.)
*/
-static int
+static int
XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display *dpy)
{
XDamageExtDisplayInfo *info, *prev;
@@ -165,7 +165,7 @@ XDamageExtRemoveDisplay (XDamageExtInfo *extinfo, Display *dpy)
* XextFindDisplay.)
*/
static XDamageExtDisplayInfo *
-XDamageExtFindDisplay (XDamageExtInfo *extinfo,
+XDamageExtFindDisplay (XDamageExtInfo *extinfo,
Display *dpy)
{
XDamageExtDisplayInfo *info;
@@ -173,7 +173,7 @@ XDamageExtFindDisplay (XDamageExtInfo *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;
/*
@@ -199,11 +199,11 @@ XDamageFindDisplay (Display *dpy)
info = XDamageExtFindDisplay (&XDamageExtensionInfo, dpy);
if (!info)
- info = XDamageExtAddDisplay (&XDamageExtensionInfo, dpy,
+ info = XDamageExtAddDisplay (&XDamageExtensionInfo, dpy,
XDamageExtensionName);
return info;
}
-
+
static int
XDamageCloseDisplay (Display *dpy, XExtCodes *codes)
{
@@ -280,24 +280,24 @@ XDamageEventToWire(Display *dpy, XEvent *event, xEvent *wire)
return False;
}
-Bool
+Bool
XDamageQueryExtension (Display *dpy,
int *event_base_return,
int *error_base_return)
{
XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy);
- if (XDamageHasExtension(info))
+ if (XDamageHasExtension(info))
{
*event_base_return = info->codes->first_event;
*error_base_return = info->codes->first_error;
return True;
- }
+ }
else
return False;
}
-Status
+Status
XDamageQueryVersion (Display *dpy,
int *major_version_return,
int *minor_version_return)
@@ -348,7 +348,7 @@ XDamageDestroy (Display *dpy, Damage damage)
}
void
-XDamageSubtract (Display *dpy, Damage damage,
+XDamageSubtract (Display *dpy, Damage damage,
XserverRegion repair, XserverRegion parts)
{
XDamageExtDisplayInfo *info = XDamageFindDisplay (dpy);