SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zap trailing whitespace

Browse source
This commit is contained in:
purplerain 2023-08-30 19:15:54 +00:00
parent df21ad3c47
commit c6dfd6da0e
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
17 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xserver/dbe/midbe.c
View file

@ -56,7 +56,7 @@
#include <stdio.h> #include <stdio.h>
/****************************************************************************** /******************************************************************************
* *
* DBE MI Procedure: miDbeGetVisualInfo * DBE MI Procedure: miDbeGetVisualInfo

4
xserver/hw/xfree86/os-support/bsd/alpha_video.c
View file

@ -325,8 +325,8 @@ int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
= readDense32; = readDense32;
/* /*
* Do all things that need root privileges early * Do all things that need root privileges early
* and revoke those priviledges * and revoke those priviledges
*/ */
_X_EXPORT void _X_EXPORT void
xf86PrivilegedInit(void) xf86PrivilegedInit(void)

2
xserver/hw/xfree86/os-support/bsd/bsd_agp.c
View file

@ -85,7 +85,7 @@ GARTInit(int screenNum)
return FALSE; return FALSE;
} }
xf86ReleaseGART(-1); xf86ReleaseGART(-1);
return TRUE; return TRUE;
} }

4
xserver/hw/xfree86/os-support/bsd/bsd_init.c
View file

@ -796,7 +796,7 @@ void
xf86DropPriv(void) xf86DropPriv(void)
{ {
struct passwd *pw; struct passwd *pw;
/* revoke privileges */ /* revoke privileges */
if (getuid() == 0) { if (getuid() == 0) {
/* Running as root */ /* Running as root */
@ -807,7 +807,7 @@ xf86DropPriv(void)
if (ChownLock(pw->pw_uid, pw->pw_gid) == -1) { if (ChownLock(pw->pw_uid, pw->pw_gid) == -1) {
FatalError("Chown Lock"); FatalError("Chown Lock");
} }
/* Start privileged child */ /* Start privileged child */
if (priv_init(pw->pw_uid, pw->pw_gid) == -1) { if (priv_init(pw->pw_uid, pw->pw_gid) == -1) {
FatalError("priv_init"); FatalError("priv_init");

22
xserver/hw/xfree86/os-support/bsd/hppa_video.c
View file

@ -7,19 +7,19 @@
* documentation for any purpose is hereby granted without fee, provided that * documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that * the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting * copyright notice and this permission notice appear in supporting
* documentation, and that the names of Rich Murphey and David Wexelblat * documentation, and that the names of Rich Murphey and David Wexelblat
* not be used in advertising or publicity pertaining to distribution of * not be used in advertising or publicity pertaining to distribution of
* the software without specific, written prior permission. Rich Murphey and * the software without specific, written prior permission. Rich Murphey and
* David Wexelblat make no representations about the suitability of this * David Wexelblat make no representations about the suitability of this
* software for any purpose. It is provided "as is" without express or * software for any purpose. It is provided "as is" without express or
* implied warranty. * implied warranty.
* *
* RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
* THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
* ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
*/ */
@ -57,7 +57,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
#ifdef X_PRIVSEP #ifdef X_PRIVSEP
/* /*
* Do all initialisation that need root privileges * Do all initialisation that need root privileges
*/ */
void void
xf86PrivilegedInit(void) xf86PrivilegedInit(void)

18
xserver/hw/xfree86/os-support/bsd/i386_video.c
View file

@ -78,14 +78,14 @@ checkDevMem(Bool warn)
if (devMemChecked) if (devMemChecked)
return; return;
devMemChecked = TRUE; devMemChecked = TRUE;
#ifdef HAS_APERTURE_DRV #ifdef HAS_APERTURE_DRV
/* Try the aperture driver first */ /* Try the aperture driver first */
if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) { if ((fd = open(DEV_APERTURE, O_RDWR)) >= 0) {
/* Try to map a page at the VGA address */ /* Try to map a page at the VGA address */
base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE, base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
MAP_FLAGS, fd, (off_t)0xA0000); MAP_FLAGS, fd, (off_t)0xA0000);
if (base != MAP_FAILED) { if (base != MAP_FAILED) {
munmap((caddr_t)base, 4096); munmap((caddr_t)base, 4096);
devMemFd = fd; devMemFd = fd;
@ -106,7 +106,7 @@ checkDevMem(Bool warn)
/* Try to map a page at the VGA address */ /* Try to map a page at the VGA address */
base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE, base = mmap((caddr_t)0, 4096, PROT_READ | PROT_WRITE,
MAP_FLAGS, fd, (off_t)0xA0000); MAP_FLAGS, fd, (off_t)0xA0000);
if (base != MAP_FAILED) { if (base != MAP_FAILED) {
munmap((caddr_t)base, 4096); munmap((caddr_t)base, 4096);
devMemFd = fd; devMemFd = fd;
@ -134,7 +134,7 @@ checkDevMem(Bool warn)
"\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno), "\t(%s)\n%s", DEV_APERTURE, DEV_MEM, strerror(errno),
SYSCTL_MSG); SYSCTL_MSG);
#endif /* __OpenBSD__ */ #endif /* __OpenBSD__ */
xf86ErrorF("\tlinear framebuffer access unavailable\n"); xf86ErrorF("\tlinear framebuffer access unavailable\n");
} }
useDevMem = FALSE; useDevMem = FALSE;
@ -228,13 +228,13 @@ xf86DisableIO()
{ {
if (!ExtendedEnabled) if (!ExtendedEnabled)
return; return;
if (amd64_iopl(FALSE) == 0) { if (amd64_iopl(FALSE) == 0) {
ExtendedEnabled = FALSE; ExtendedEnabled = FALSE;
} }
/* Otherwise, the X server has revoqued its root uid, /* Otherwise, the X server has revoqued its root uid,
and thus cannot give up IO privileges any more */ and thus cannot give up IO privileges any more */
return; return;
} }
@ -280,7 +280,7 @@ xf86SetTVOut(int mode)
switch (xf86Info.consType) { switch (xf86Info.consType) {
#ifdef PCCONS_SUPPORT #ifdef PCCONS_SUPPORT
case PCCONS:{ case PCCONS:{
if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) { if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_ON, &mode) < 0) {
xf86Msg(X_WARNING, xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to TV output, %s\n", "xf86SetTVOut: Could not set console to TV output, %s\n",
@ -303,7 +303,7 @@ xf86SetRGBOut()
switch (xf86Info.consType) { switch (xf86Info.consType) {
#ifdef PCCONS_SUPPORT #ifdef PCCONS_SUPPORT
case PCCONS:{ case PCCONS:{
if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) { if (ioctl (xf86Info.consoleFd, CONSOLE_X_TV_OFF, 0) < 0) {
xf86Msg(X_WARNING, xf86Msg(X_WARNING,
"xf86SetTVOut: Could not set console to RGB output, %s\n", "xf86SetTVOut: Could not set console to RGB output, %s\n",
@ -332,7 +332,7 @@ _X_EXPORT void
xf86PrivilegedInit(void) xf86PrivilegedInit(void)
{ {
checkDevMem(TRUE); checkDevMem(TRUE);
pci_system_init(); pci_system_init();
pci_legacy_open_io(NULL, 0, 64*1024); pci_legacy_open_io(NULL, 0, 64*1024);
ExtendedEnabled = TRUE; /* Will die with xf86EnableIO() */ ExtendedEnabled = TRUE; /* Will die with xf86EnableIO() */

24
xserver/hw/xfree86/os-support/bsd/sgi_video.c
View file

@ -6,19 +6,19 @@
* documentation for any purpose is hereby granted without fee, provided that * documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that * the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting * copyright notice and this permission notice appear in supporting
* documentation, and that the names of Rich Murphey and David Wexelblat * documentation, and that the names of Rich Murphey and David Wexelblat
* not be used in advertising or publicity pertaining to distribution of * not be used in advertising or publicity pertaining to distribution of
* the software without specific, written prior permission. Rich Murphey and * the software without specific, written prior permission. Rich Murphey and
* David Wexelblat make no representations about the suitability of this * David Wexelblat make no representations about the suitability of this
* software for any purpose. It is provided "as is" without express or * software for any purpose. It is provided "as is" without express or
* implied warranty. * implied warranty.
* *
* RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO
* THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR
* ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
*/ */
@ -47,8 +47,8 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
#ifdef X_PRIVSEP #ifdef X_PRIVSEP
/* /*
* Do all things that need root privileges early * Do all things that need root privileges early
* and revoke those privileges * and revoke those privileges
*/ */
_X_EXPORT void _X_EXPORT void
xf86PrivilegedInit(void) xf86PrivilegedInit(void)

4
xserver/hw/xfree86/os-support/bsd/sparc64_video.c
View file

@ -48,8 +48,8 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
#ifdef X_PRIVSEP #ifdef X_PRIVSEP
/* /*
* Do all things that need root privileges early * Do all things that need root privileges early
* and revoke those privileges * and revoke those privileges
*/ */
_X_EXPORT void _X_EXPORT void
xf86PrivilegedInit(void) xf86PrivilegedInit(void)

2
xserver/hw/xwin/winconfig.c
View file

@ -25,7 +25,7 @@
*or other dealings in this Software without prior written authorization *or other dealings in this Software without prior written authorization
*from the XFree86 Project. *from the XFree86 Project.
* *
* Authors: Alexander Gottwald * Authors: Alexander Gottwald
*/ */
#ifdef HAVE_XWIN_CONFIG_H #ifdef HAVE_XWIN_CONFIG_H

2
xserver/hw/xwin/winconfig.h
View file

@ -27,7 +27,7 @@
*or other dealings in this Software without prior written authorization *or other dealings in this Software without prior written authorization
*from the XFree86 Project. *from the XFree86 Project.
* *
* Authors: Alexander Gottwald * Authors: Alexander Gottwald
*/ */
#include "win.h" #include "win.h"

2
xserver/hw/xwin/winmsg.c
View file

@ -25,7 +25,7 @@
*or other dealings in this Software without prior written authorization *or other dealings in this Software without prior written authorization
*from the XFree86 Project. *from the XFree86 Project.
* *
* Authors: Alexander Gottwald * Authors: Alexander Gottwald
*/ */
#ifdef HAVE_XWIN_CONFIG_H #ifdef HAVE_XWIN_CONFIG_H

2
xserver/hw/xwin/winmsg.h
View file

@ -25,7 +25,7 @@
*or other dealings in this Software without prior written authorization *or other dealings in this Software without prior written authorization
*from the XFree86 Project. *from the XFree86 Project.
* *
* Authors: Alexander Gottwald * Authors: Alexander Gottwald
*/ */
#ifndef __WIN_MSG_H__ #ifndef __WIN_MSG_H__

2
xserver/hw/xwin/winprefslex.l
View file

@ -118,7 +118,7 @@ parse_file (FILE *file)
if (!file) if (!file)
return 1; return 1;
yylineno = 1; yylineno = 1;
yyin = file; yyin = file;
ret = yyparse (); ret = yyparse ();

12
xserver/hw/xwin/winprefsyacc.y
View file

@ -51,7 +51,7 @@
/* The global pref settings */ /* The global pref settings */
WINPREFS pref; WINPREFS pref;
/* The working menu */ /* The working menu */
static MENUPARSED menu; static MENUPARSED menu;
/* Functions for parsing the tokens into out structure */ /* Functions for parsing the tokens into out structure */
@ -139,7 +139,7 @@ line: NEWLINE
; ;
newline_or_nada: newline_or_nada:
| NEWLINE newline_or_nada | NEWLINE newline_or_nada
; ;
@ -335,19 +335,19 @@ CloseMenu (void)
ErrorF("LoadPreferences: Empty menu detected\n"); ErrorF("LoadPreferences: Empty menu detected\n");
return; return;
} }
if (pref.menuItems) if (pref.menuItems)
pref.menu = realloc (pref.menu, (pref.menuItems+1)*sizeof(MENUPARSED)); pref.menu = realloc (pref.menu, (pref.menuItems+1)*sizeof(MENUPARSED));
else else
pref.menu = malloc (sizeof(MENUPARSED)); pref.menu = malloc (sizeof(MENUPARSED));
memcpy (pref.menu+pref.menuItems, &menu, sizeof(MENUPARSED)); memcpy (pref.menu+pref.menuItems, &menu, sizeof(MENUPARSED));
pref.menuItems++; pref.menuItems++;
memset (&menu, 0, sizeof(MENUPARSED)); memset (&menu, 0, sizeof(MENUPARSED));
} }
static void static void
OpenIcons (void) OpenIcons (void)
{ {
if (pref.icon != NULL) { if (pref.icon != NULL) {
@ -377,7 +377,7 @@ AddIconLine (char *matchstr, char *iconfile)
pref.iconItems++; pref.iconItems++;
} }
static void static void
CloseIcons (void) CloseIcons (void)
{ {
} }

2
xserver/os/xsha1.c
View file

@ -13,7 +13,7 @@
* The above copyright notice and this permission notice (including the next * The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the * paragraph) shall be included in all copies or substantial portions of the
* Software. * Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

2
xserver/randr/rrcrtc.c
View file

@ -2071,6 +2071,6 @@ RRHasScanoutPixmap(ScreenPtr pScreen)
if (crtc->scanout_pixmap) if (crtc->scanout_pixmap)
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }

2
xserver/xkb/xkb.c
View file

@ -2433,7 +2433,7 @@ _XkbSetMapCheckLength(xkbSetMapReq *req)
} }
/* actions */ /* actions */
if (req->present & XkbKeyActionsMask) { if (req->present & XkbKeyActionsMask) {
_add_check_len(req->totalActs * sz_xkbActionWireDesc _add_check_len(req->totalActs * sz_xkbActionWireDesc
+ XkbPaddedSize(req->nKeyActs)); + XkbPaddedSize(req->nKeyActs));
} }
/* behaviours */ /* behaviours */