From c6dfd6da0eb38874dc88e52033b87f200b7371c5 Mon Sep 17 00:00:00 2001 From: purplerain Date: Wed, 30 Aug 2023 19:15:54 +0000 Subject: [PATCH] zap trailing whitespace --- xserver/dbe/midbe.c | 2 +- .../hw/xfree86/os-support/bsd/alpha_video.c | 4 ++-- xserver/hw/xfree86/os-support/bsd/bsd_agp.c | 2 +- xserver/hw/xfree86/os-support/bsd/bsd_init.c | 4 ++-- .../hw/xfree86/os-support/bsd/hppa_video.c | 22 ++++++++--------- .../hw/xfree86/os-support/bsd/i386_video.c | 18 +++++++------- xserver/hw/xfree86/os-support/bsd/sgi_video.c | 24 +++++++++---------- .../hw/xfree86/os-support/bsd/sparc64_video.c | 4 ++-- xserver/hw/xwin/winconfig.c | 2 +- xserver/hw/xwin/winconfig.h | 2 +- xserver/hw/xwin/winmsg.c | 2 +- xserver/hw/xwin/winmsg.h | 2 +- xserver/hw/xwin/winprefslex.l | 2 +- xserver/hw/xwin/winprefsyacc.y | 12 +++++----- xserver/os/xsha1.c | 2 +- xserver/randr/rrcrtc.c | 2 +- xserver/xkb/xkb.c | 2 +- 17 files changed, 54 insertions(+), 54 deletions(-) diff --git a/xserver/dbe/midbe.c b/xserver/dbe/midbe.c index e3efd93c..db4daba0 100644 --- a/xserver/dbe/midbe.c +++ b/xserver/dbe/midbe.c @@ -56,7 +56,7 @@ #include - + /****************************************************************************** * * DBE MI Procedure: miDbeGetVisualInfo diff --git a/xserver/hw/xfree86/os-support/bsd/alpha_video.c b/xserver/hw/xfree86/os-support/bsd/alpha_video.c index df3eecf1..d2c17c7f 100644 --- a/xserver/hw/xfree86/os-support/bsd/alpha_video.c +++ b/xserver/hw/xfree86/os-support/bsd/alpha_video.c @@ -325,8 +325,8 @@ int (*xf86ReadMmio32) (void *Base, unsigned long Offset) = readDense32; /* - * Do all things that need root privileges early - * and revoke those priviledges + * Do all things that need root privileges early + * and revoke those priviledges */ _X_EXPORT void xf86PrivilegedInit(void) diff --git a/xserver/hw/xfree86/os-support/bsd/bsd_agp.c b/xserver/hw/xfree86/os-support/bsd/bsd_agp.c index 122035a0..f56bd26a 100644 --- a/xserver/hw/xfree86/os-support/bsd/bsd_agp.c +++ b/xserver/hw/xfree86/os-support/bsd/bsd_agp.c @@ -85,7 +85,7 @@ GARTInit(int screenNum) return FALSE; } xf86ReleaseGART(-1); - + return TRUE; } diff --git a/xserver/hw/xfree86/os-support/bsd/bsd_init.c b/xserver/hw/xfree86/os-support/bsd/bsd_init.c index f19af5e9..09bf5e5d 100644 --- a/xserver/hw/xfree86/os-support/bsd/bsd_init.c +++ b/xserver/hw/xfree86/os-support/bsd/bsd_init.c @@ -796,7 +796,7 @@ void xf86DropPriv(void) { struct passwd *pw; - + /* revoke privileges */ if (getuid() == 0) { /* Running as root */ @@ -807,7 +807,7 @@ xf86DropPriv(void) if (ChownLock(pw->pw_uid, pw->pw_gid) == -1) { FatalError("Chown Lock"); } - + /* Start privileged child */ if (priv_init(pw->pw_uid, pw->pw_gid) == -1) { FatalError("priv_init"); diff --git a/xserver/hw/xfree86/os-support/bsd/hppa_video.c b/xserver/hw/xfree86/os-support/bsd/hppa_video.c index 285d3554..d6911160 100644 --- a/xserver/hw/xfree86/os-support/bsd/hppa_video.c +++ b/xserver/hw/xfree86/os-support/bsd/hppa_video.c @@ -7,19 +7,19 @@ * documentation for any purpose is hereby granted without fee, 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 names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT 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 + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT 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. * */ @@ -57,7 +57,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) #ifdef X_PRIVSEP /* - * Do all initialisation that need root privileges + * Do all initialisation that need root privileges */ void xf86PrivilegedInit(void) diff --git a/xserver/hw/xfree86/os-support/bsd/i386_video.c b/xserver/hw/xfree86/os-support/bsd/i386_video.c index b138d23c..0ff2bac0 100644 --- a/xserver/hw/xfree86/os-support/bsd/i386_video.c +++ b/xserver/hw/xfree86/os-support/bsd/i386_video.c @@ -78,14 +78,14 @@ checkDevMem(Bool warn) if (devMemChecked) return; devMemChecked = TRUE; - + #ifdef HAS_APERTURE_DRV /* Try the aperture driver first */ if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) { /* Try to map a page at the VGA address */ base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE, MAP_FLAGS, fd, (off_t)0xA0000); - + if (base != MAP_FAILED) { munmap((caddr_t)base, 4096); devMemFd = fd; @@ -106,7 +106,7 @@ checkDevMem(Bool warn) /* Try to map a page at the VGA address */ base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE, MAP_FLAGS, fd, (off_t)0xA0000); - + if (base != MAP_FAILED) { munmap((caddr_t)base, 4096); devMemFd = fd; @@ -134,7 +134,7 @@ checkDevMem(Bool warn) "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno), SYSCTL_MSG); #endif /* __OpenBSD__ */ - + xf86ErrorF("\tlinear framebuffer access unavailable\n"); } useDevMem = FALSE; @@ -228,13 +228,13 @@ xf86DisableIO() { if (!ExtendedEnabled) return; - + if (amd64_iopl(FALSE) == 0) { ExtendedEnabled = FALSE; } /* Otherwise, the X server has revoqued its root uid, and thus cannot give up IO privileges any more */ - + return; } @@ -280,7 +280,7 @@ xf86SetTVOut(int mode) switch (xf86Info.consType) { #ifdef PCCONS_SUPPORT case PCCONS:{ - + if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) { xf86Msg(X_WARNING, "xf86SetTVOut: Could not set console to TV output, %s\n", @@ -303,7 +303,7 @@ xf86SetRGBOut() switch (xf86Info.consType) { #ifdef PCCONS_SUPPORT case PCCONS:{ - + if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) { xf86Msg(X_WARNING, "xf86SetTVOut: Could not set console to RGB output, %s\n", @@ -332,7 +332,7 @@ _X_EXPORT void xf86PrivilegedInit(void) { checkDevMem(TRUE); - + pci_system_init(); pci_legacy_open_io(NULL, 0, 64*1024); ExtendedEnabled = TRUE; /* Will die with xf86EnableIO() */ diff --git a/xserver/hw/xfree86/os-support/bsd/sgi_video.c b/xserver/hw/xfree86/os-support/bsd/sgi_video.c index e94700d6..3456a961 100644 --- a/xserver/hw/xfree86/os-support/bsd/sgi_video.c +++ b/xserver/hw/xfree86/os-support/bsd/sgi_video.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, 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 names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT 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 + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT 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. * */ @@ -47,8 +47,8 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) #ifdef X_PRIVSEP /* - * Do all things that need root privileges early - * and revoke those privileges + * Do all things that need root privileges early + * and revoke those privileges */ _X_EXPORT void xf86PrivilegedInit(void) diff --git a/xserver/hw/xfree86/os-support/bsd/sparc64_video.c b/xserver/hw/xfree86/os-support/bsd/sparc64_video.c index ec24c5c0..b612e325 100644 --- a/xserver/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/xserver/hw/xfree86/os-support/bsd/sparc64_video.c @@ -48,8 +48,8 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) #ifdef X_PRIVSEP /* - * Do all things that need root privileges early - * and revoke those privileges + * Do all things that need root privileges early + * and revoke those privileges */ _X_EXPORT void xf86PrivilegedInit(void) diff --git a/xserver/hw/xwin/winconfig.c b/xserver/hw/xwin/winconfig.c index 4f16b21e..41af9f0c 100644 --- a/xserver/hw/xwin/winconfig.c +++ b/xserver/hw/xwin/winconfig.c @@ -25,7 +25,7 @@ *or other dealings in this Software without prior written authorization *from the XFree86 Project. * - * Authors: Alexander Gottwald + * Authors: Alexander Gottwald */ #ifdef HAVE_XWIN_CONFIG_H diff --git a/xserver/hw/xwin/winconfig.h b/xserver/hw/xwin/winconfig.h index bd1f5965..6a61066b 100644 --- a/xserver/hw/xwin/winconfig.h +++ b/xserver/hw/xwin/winconfig.h @@ -27,7 +27,7 @@ *or other dealings in this Software without prior written authorization *from the XFree86 Project. * - * Authors: Alexander Gottwald + * Authors: Alexander Gottwald */ #include "win.h" diff --git a/xserver/hw/xwin/winmsg.c b/xserver/hw/xwin/winmsg.c index 2ee48ce5..b0c8ab10 100644 --- a/xserver/hw/xwin/winmsg.c +++ b/xserver/hw/xwin/winmsg.c @@ -25,7 +25,7 @@ *or other dealings in this Software without prior written authorization *from the XFree86 Project. * - * Authors: Alexander Gottwald + * Authors: Alexander Gottwald */ #ifdef HAVE_XWIN_CONFIG_H diff --git a/xserver/hw/xwin/winmsg.h b/xserver/hw/xwin/winmsg.h index 02f672f0..caaf6ca4 100644 --- a/xserver/hw/xwin/winmsg.h +++ b/xserver/hw/xwin/winmsg.h @@ -25,7 +25,7 @@ *or other dealings in this Software without prior written authorization *from the XFree86 Project. * - * Authors: Alexander Gottwald + * Authors: Alexander Gottwald */ #ifndef __WIN_MSG_H__ diff --git a/xserver/hw/xwin/winprefslex.l b/xserver/hw/xwin/winprefslex.l index 9e6f0d6d..0b400a59 100644 --- a/xserver/hw/xwin/winprefslex.l +++ b/xserver/hw/xwin/winprefslex.l @@ -118,7 +118,7 @@ parse_file (FILE *file) if (!file) return 1; - + yylineno = 1; yyin = file; ret = yyparse (); diff --git a/xserver/hw/xwin/winprefsyacc.y b/xserver/hw/xwin/winprefsyacc.y index 9bb28ae9..ee83f7ec 100644 --- a/xserver/hw/xwin/winprefsyacc.y +++ b/xserver/hw/xwin/winprefsyacc.y @@ -51,7 +51,7 @@ /* The global pref settings */ WINPREFS pref; -/* The working menu */ +/* The working menu */ static MENUPARSED menu; /* Functions for parsing the tokens into out structure */ @@ -139,7 +139,7 @@ line: NEWLINE ; -newline_or_nada: +newline_or_nada: | NEWLINE newline_or_nada ; @@ -335,19 +335,19 @@ CloseMenu (void) ErrorF("LoadPreferences: Empty menu detected\n"); return; } - + if (pref.menuItems) pref.menu = realloc (pref.menu, (pref.menuItems+1)*sizeof(MENUPARSED)); else pref.menu = malloc (sizeof(MENUPARSED)); - + memcpy (pref.menu+pref.menuItems, &menu, sizeof(MENUPARSED)); pref.menuItems++; memset (&menu, 0, sizeof(MENUPARSED)); } -static void +static void OpenIcons (void) { if (pref.icon != NULL) { @@ -377,7 +377,7 @@ AddIconLine (char *matchstr, char *iconfile) pref.iconItems++; } -static void +static void CloseIcons (void) { } diff --git a/xserver/os/xsha1.c b/xserver/os/xsha1.c index a160b7eb..0e16209a 100644 --- a/xserver/os/xsha1.c +++ b/xserver/os/xsha1.c @@ -13,7 +13,7 @@ * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL diff --git a/xserver/randr/rrcrtc.c b/xserver/randr/rrcrtc.c index 3a9b620a..adbfa994 100644 --- a/xserver/randr/rrcrtc.c +++ b/xserver/randr/rrcrtc.c @@ -2071,6 +2071,6 @@ RRHasScanoutPixmap(ScreenPtr pScreen) if (crtc->scanout_pixmap) return TRUE; } - + return FALSE; } diff --git a/xserver/xkb/xkb.c b/xserver/xkb/xkb.c index 276dc193..4d2ef8a2 100644 --- a/xserver/xkb/xkb.c +++ b/xserver/xkb/xkb.c @@ -2433,7 +2433,7 @@ _XkbSetMapCheckLength(xkbSetMapReq *req) } /* actions */ if (req->present & XkbKeyActionsMask) { - _add_check_len(req->totalActs * sz_xkbActionWireDesc + _add_check_len(req->totalActs * sz_xkbActionWireDesc + XkbPaddedSize(req->nKeyActs)); } /* behaviours */