summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:06:15 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-16 22:06:15 -0700
commit19bea63b9b39d83da9b4aa277cc1db967a4928bd (patch)
tree9012c94dafae8f0ae7fcac1f35642ea6fae7f1bb
parent1ab0d436ceac0acef0cd97d8b280727b02062cc8 (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/dmxext.h2
-rw-r--r--man/DMXGetInputAttributes.man2
-rw-r--r--man/Makefile.am4
-rw-r--r--src/dmx.c18
5 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index c1e1118..be67679 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# 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
@@ -10,7 +10,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/include/X11/extensions/dmxext.h b/include/X11/extensions/dmxext.h
index 492aabf..93a1bfa 100644
--- a/include/X11/extensions/dmxext.h
+++ b/include/X11/extensions/dmxext.h
@@ -87,7 +87,7 @@ typedef enum {
} DMXInputEnum;
/** Client-library input information structure, returned by
- * #DMXGetInputAttributes. */
+ * #DMXGetInputAttributes. */
typedef struct {
DMXInputEnum inputType;
int physicalScreen;
diff --git a/man/DMXGetInputAttributes.man b/man/DMXGetInputAttributes.man
index 43c7e27..4a0b1cf 100644
--- a/man/DMXGetInputAttributes.man
+++ b/man/DMXGetInputAttributes.man
@@ -74,7 +74,7 @@ For local devices, all other fields returned, except
.I isCore " and " sendsCore ,
are invalid.
.PP
-For console devices,
+For console devices,
.I physicalScreen " and " physicalID
will be invalid, and
.I name
diff --git a/man/Makefile.am b/man/Makefile.am
index c1027c0..c2129c9 100644
--- a/man/Makefile.am
+++ b/man/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/src/dmx.c b/src/dmx.c
index 6167a01..7388458 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -251,7 +251,7 @@ Bool DMXGetScreenAttributes(Display *dpy, int physical_screen,
_XReadPad(dpy, attr->displayName, rep.displayNameLength);
attr->displayName[rep.displayNameLength] = '\0';
attr->logicalScreen = rep.logicalScreen;
-
+
attr->screenWindowWidth = rep.screenWindowWidth;
attr->screenWindowHeight = rep.screenWindowHeight;
attr->screenWindowXoffset = rep.screenWindowXoffset;
@@ -293,7 +293,7 @@ static int _DMXDumpScreenAttributes(Display *dpy,
unsigned long value_list[32];
unsigned long *value = value_list;
int count = 0;
-
+
for (i = 0; i < 32; i++) {
if (mask & (1 << i)) {
*value++ = _DMXGetScreenAttribute(i, attr);
@@ -383,7 +383,7 @@ int DMXChangeScreensAttributes(Display *dpy,
if (i < mask_count) mask = masks[i];
req->length += _DMXDumpScreenAttributes(dpy, mask, attrs + i);
}
-
+
if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
@@ -518,7 +518,7 @@ Bool DMXGetWindowAttributes(Display *dpy, Window window,
_XRead(dpy, (char *)windows, rep.screenCount * sizeof(*windows));
_XRead(dpy, (char *)pos, rep.screenCount * sizeof(*pos));
_XRead(dpy, (char *)vis, rep.screenCount * sizeof(*vis));
-
+
*screen_count = rep.screenCount;
for (current = 0;
current < rep.screenCount && current < (unsigned)available_count;
@@ -590,7 +590,7 @@ static int _DMXDumpDesktopAttributes(Display *dpy,
unsigned long value_list[32];
unsigned long *value = value_list;
int count = 0;
-
+
for (i = 0; i < 32; i++) {
if (mask & (1 << i)) {
*value++ = _DMXGetDesktopAttribute(i, attr);
@@ -606,7 +606,7 @@ static int _DMXDumpDesktopAttributes(Display *dpy,
* Available in DMX Protocol Version 2.0 */
int DMXChangeDesktopAttributes(Display *dpy,
unsigned int mask,
- DMXDesktopAttributes *attr)
+ DMXDesktopAttributes *attr)
{
XExtDisplayInfo *info = find_display(dpy);
xDMXChangeDesktopAttributesReply rep;
@@ -620,7 +620,7 @@ int DMXChangeDesktopAttributes(Display *dpy,
req->dmxReqType = X_DMXChangeDesktopAttributes;
req->valueMask = mask;
req->length +=_DMXDumpDesktopAttributes(dpy, mask, attr);
-
+
if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
@@ -754,7 +754,7 @@ Bool DMXAddBackendInput(Display *dpy, int screen, int sendsCore, int *newId)
unsigned int mask = (DMXInputType
| DMXInputPhysicalScreen
| DMXInputSendsCore);
-
+
attr.inputType = DMXBackendInputType;
attr.physicalScreen = screen;
attr.sendsCore = sendsCore;
@@ -769,7 +769,7 @@ Bool DMXAddConsoleInput(Display *dpy, const char *name, int sendsCore,
DMXInputAttributes attr;
unsigned int mask = (DMXInputType
| DMXInputSendsCore);
-
+
attr.inputType = DMXConsoleInputType;
attr.physicalScreen = 0;
attr.sendsCore = sendsCore;