Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/sun ErrorF() doesn't appe...
details: https://anonhg.NetBSD.org/xsrc/rev/c4661931661f
branches: trunk
changeset: 10656:c4661931661f
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Thu Mar 11 11:54:41 2021 +0000
description:
ErrorF() doesn't append newlines at the end of messages.
diffstat:
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c | 10 +++++-----
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c | 4 ++--
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c | 14 +++++++-------
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c | 14 +++++++-------
external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c | 4 ++--
external/mit/xorg-server/dist/hw/sun/sunCfb.c | 4 ++--
external/mit/xorg-server/dist/hw/sun/sunFbs.c | 6 +++---
external/mit/xorg-server/dist/hw/sun/sunInit.c | 6 +++---
external/mit/xorg-server/dist/hw/sun/sunKbd.c | 14 +++++++-------
external/mit/xorg-server/dist/hw/sun/sunMouse.c | 10 +++++-----
10 files changed, 43 insertions(+), 43 deletions(-)
diffs (truncated from 384 to 300 lines):
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c Thu Mar 11 11:54:41 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.7 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.8 2021/03/11 12:08:57 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -50,12 +50,12 @@
/* open frame buffer */
if ( ( pPriv->fd = open(device, O_RDWR, 0)) < 0) {
- ErrorF( "Can't open frame buffer" );
+ ErrorF( "Can't open frame buffer\n" );
return FALSE;
}
/* get frame buffer infomation */
if ( ioctl( pPriv->fd, GRFIOCGINFO, &gi ) == -1 ) {
- ErrorF( "Can't get grfinfo" );
+ ErrorF( "Can't get grfinfo\n" );
return FALSE;
}
pPriv->mapsize = gi.gd_regsize + gi.gd_fbsize;
@@ -64,7 +64,7 @@
pPriv->reg = (FbReg *)mmap(0, pPriv->mapsize, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pPriv->fd, 0 );
if ( pPriv->reg == (FbReg *)-1) {
- ErrorF( "Can't map frame buffer" );
+ ErrorF( "Can't map frame buffer\n" );
return FALSE;
}
pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
@@ -114,7 +114,7 @@
/* unmap and close frame buffer */
if ( munmap(pPriv->reg, pPriv->mapsize) == -1 )
- ErrorF("Can't unmap frame buffer");
+ ErrorF("Can't unmap frame buffer\n");
close(pPriv->fd);
}
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c Thu Mar 11 11:54:41 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.9 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -195,7 +195,7 @@
/* store private record into screen */
if (!dixRegisterPrivateKey(&x68kScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) {
- ErrorF("dixRegisterPrivateKey failed");
+ ErrorF("dixRegisterPrivateKey failed\n");
return FALSE;
}
x68kSetScreenPrivate(pScreen, pPriv);
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c Thu Mar 11 11:54:41 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.10 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.11 2021/03/11 12:08:57 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -121,7 +121,7 @@
case DEVICE_INIT:
pKeyboard->devicePrivate = (void *)&x68kKbdPriv;
if( (x68kKbdPriv.fd = open("/dev/kbd", O_RDONLY)) == -1 ) {
- ErrorF("Can't open keyboard device");
+ ErrorF("Can't open keyboard device\n");
return !Success;
}
pKeyboard->on = FALSE;
@@ -146,7 +146,7 @@
if ( fcntl(x68kKbdPriv.fd, F_SETOWN, getpid()) == -1 ||
fcntl(x68kKbdPriv.fd, F_SETFL, O_NONBLOCK|O_ASYNC) == -1 ||
ioctl(x68kKbdPriv.fd, KIOCSDIRECT, &mode) == -1 ) {
- ErrorF("Async keyboard I/O failed");
+ ErrorF("Async keyboard I/O failed\n");
return !Success;
}
x68kSetLeds(&x68kKbdPriv, (uint8_t)x68kKbdPriv.leds);
@@ -271,7 +271,7 @@
*pNumEvents = 0;
*pAgain = FALSE;
} else {
- ErrorF("Reading keyboard");
+ ErrorF("Reading keyboard\n");
FatalError ("Could not read the keyboard");
}
} else {
@@ -324,13 +324,13 @@
kbdCmd = KBD_CMD_BELL;
if (ioctl (pPriv->fd, KIOCCMD, &kbdCmd) == -1) {
- ErrorF("Failed to activate bell");
+ ErrorF("Failed to activate bell\n");
return;
}
usleep (duration * 1000);
kbdCmd = KBD_CMD_NOBELL;
if (ioctl (pPriv->fd, KIOCCMD, &kbdCmd) == -1)
- ErrorF("Failed to deactivate bell");
+ ErrorF("Failed to deactivate bell\n");
}
static void
@@ -399,7 +399,7 @@
{
/* bit sequence of led indicator in xkb and hardware are same */
if (ioctl(pPriv->fd, KIOCSLED, &data) == -1)
- ErrorF("Failed to set keyboard lights");
+ ErrorF("Failed to set keyboard lights\n");
}
Bool
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c Thu Mar 11 11:54:41 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.9 2021/02/07 16:55:18 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -136,7 +136,7 @@
case DEVICE_INIT:
pMouse->devicePrivate = (void *) &x68kMousePriv;
if( (x68kMousePriv.fd = open("/dev/mouse", O_RDONLY)) == -1 ) {
- ErrorF("Can't open mouse device");
+ ErrorF("Can't open mouse device\n");
return !Success;
}
pMouse->on = FALSE;
@@ -165,18 +165,18 @@
case DEVICE_ON:
if (ioctl (x68kMousePriv.fd, VUIDGFORMAT, &oformat) == -1) {
- ErrorF("x68kMouseProc ioctl VUIDGFORMAT");
+ ErrorF("x68kMouseProc ioctl VUIDGFORMAT\n");
return !Success;
}
format = VUID_FIRM_EVENT;
if (ioctl (x68kMousePriv.fd, VUIDSFORMAT, &format) == -1) {
- ErrorF("x68kMouseProc ioctl VUIDSFORMAT");
+ ErrorF("x68kMouseProc ioctl VUIDSFORMAT\n");
return !Success;
}
if ( fcntl(x68kMousePriv.fd, F_SETOWN, getpid()) == -1 ||
fcntl(x68kMousePriv.fd, F_SETFL, O_NONBLOCK | O_ASYNC) == -1
) {
- ErrorF("Async mouse I/O failed");
+ ErrorF("Async mouse I/O failed\n");
return !Success;
}
x68kMousePriv.bmask = 0;
@@ -192,7 +192,7 @@
case DEVICE_CLOSE:
if (ioctl (x68kMousePriv.fd, VUIDSFORMAT, &oformat) == -1)
- ErrorF("x68kMouseProc ioctl VUIDSFORMAT");
+ ErrorF("x68kMouseProc ioctl VUIDSFORMAT\n");
break;
}
@@ -246,7 +246,7 @@
*pNumEvents = 0;
*pAgain = FALSE;
} else {
- ErrorF("x68kMouseGetEvents read");
+ ErrorF("x68kMouseGetEvents read\n");
FatalError ("Could not read from mouse");
}
} else {
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c
--- a/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c Thu Mar 11 11:54:41 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kText.c,v 1.5 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kText.c,v 1.6 2021/03/11 12:08:57 tsutsui Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -99,7 +99,7 @@
pPriv = x68kGetScreenRecByType(X68K_FB_TEXT);
if ( !dixRegisterPrivateKey(&x68kScreenPrivateKeyRec, PRIVATE_SCREEN, 0) ) {
- ErrorF("dixRegisterPrivateKey failed");
+ ErrorF("dixRegisterPrivateKey failed\n");
return FALSE;
}
x68kSetScreenPrivate(pScreen, pPriv);
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/sun/sunCfb.c
--- a/external/mit/xorg-server/dist/hw/sun/sunCfb.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunCfb.c Thu Mar 11 11:54:41 2021 +0000
@@ -120,7 +120,7 @@
sunCmap.blue = &bmap[dex];
if (ioctl(sunFbs[pScreen->myNum].fd, FBIOPUTCMAP, &sunCmap) < 0) {
- ErrorF("CGUpdateColormap");
+ ErrorF("CGUpdateColormap\n");
FatalError( "CGUpdateColormap: FBIOPUTCMAP failed\n" );
}
}
@@ -137,7 +137,7 @@
sunCmap.blue = &bmap[dex];
if (ioctl(sunFbs[pScreen->myNum].fd, FBIOGETCMAP, &sunCmap) < 0) {
- ErrorF("CGGetColormap");
+ ErrorF("CGGetColormap\n");
FatalError( "CGGetColormap: FBIOGETCMAP failed\n" );
}
}
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/sun/sunFbs.c
--- a/external/mit/xorg-server/dist/hw/sun/sunFbs.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunFbs.c Thu Mar 11 11:54:41 2021 +0000
@@ -99,7 +99,7 @@
#if !defined(__bsdi__) && !defined(_MAP_NEW) && !defined(__NetBSD__) && !defined(__OpenBSD__)
if ((addr = (caddr_t) valloc (mapsize)) == NULL) {
- ErrorF("Couldn't allocate frame buffer memory");
+ ErrorF("Couldn't allocate frame buffer memory\n");
(void) close (fd);
return NULL;
}
@@ -121,7 +121,7 @@
PROT_READ | PROT_WRITE, MAP_SHARED,
fd, off);
if (mapaddr == (void *) -1) {
- ErrorF("mapping frame buffer memory");
+ ErrorF("mapping frame buffer memory\n");
(void) close (fd);
mapaddr = NULL;
}
@@ -134,7 +134,7 @@
sunScreenPtr pPrivate;
if (!dixRegisterPrivateKey(&sunScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) {
- ErrorF("dixRegisterPrivateKey failed");
+ ErrorF("dixRegisterPrivateKey failed\n");
return FALSE;
}
pPrivate = calloc(1, sizeof (sunScreenRec));
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/sun/sunInit.c
--- a/external/mit/xorg-server/dist/hw/sun/sunInit.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunInit.c Thu Mar 11 11:54:41 2021 +0000
@@ -301,7 +301,7 @@
free (fbattr);
fbattr = NULL;
if (ioctl(sunFbs[screen].fd, FBIOGTYPE, &sunFbs[screen].info) == -1) {
- ErrorF("unable to get frame buffer attributes");
+ ErrorF("unable to get frame buffer attributes\n");
(void) close(sunFbs[screen].fd);
sunFbs[screen].fd = -1;
return FALSE;
@@ -465,7 +465,7 @@
key.kio_tablemask = 0;
key.kio_station = 118;
if (ioctl(sunKbdPriv.fd, KIOCGKEY, &key) == -1) {
- ErrorF( "ioctl KIOCGKEY" );
+ ErrorF( "ioctl KIOCGKEY\n" );
FatalError("Can't KIOCGKEY on fd %d\n", sunKbdPriv.fd);
}
if (key.kio_entry != HOLE)
@@ -613,7 +613,7 @@
if (i >= 0)
i = fcntl(2, F_SETFL, i | FNDELAY);
if (i < 0) {
- ErrorF("fcntl");
+ ErrorF("fcntl\n");
ErrorF("InitOutput: can't put stderr in non-block mode\n");
}
}
diff -r b2001a16a212 -r c4661931661f external/mit/xorg-server/dist/hw/sun/sunKbd.c
--- a/external/mit/xorg-server/dist/hw/sun/sunKbd.c Tue Mar 02 10:21:09 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/sun/sunKbd.c Thu Mar 11 11:54:41 2021 +0000
@@ -191,7 +191,7 @@
#endif
};
if (ioctl (fd, KIOCSLED, (caddr_t)&led_tab[ctrl->leds & SUN_LED_MASK]) == -1)
- ErrorF("Failed to set keyboard lights");
+ ErrorF("Failed to set keyboard lights\n");
#endif
}
@@ -218,13 +218,13 @@
kbdCmd = KBD_CMD_BELL;
if (ioctl (fd, KIOCCMD, &kbdCmd) == -1) {
- ErrorF("Failed to activate bell");
+ ErrorF("Failed to activate bell\n");
return;
}
if (duration) usleep (duration);
kbdCmd = KBD_CMD_NOBELL;
Home |
Main Index |
Thread Index |
Old Index