Thu Mar 11 12:08:57 2021 UTC ()
ErrorF() doesn't append newlines at the end of messages.
(tsutsui)
diff -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -r1.10 -r1.11 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c 2020/11/04 17:16:13 1.7
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c 2021/03/11 12:08:57 1.8
@@ -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);
}
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c 2020/11/04 17:16:13 1.9
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c 2021/03/11 12:08:57 1.10
@@ -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);
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c 2021/02/07 16:55:18 1.9
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c 2021/03/11 12:08:57 1.10
@@ -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 {
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c 2020/11/04 17:16:13 1.10
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c 2021/03/11 12:08:57 1.11
@@ -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
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c 2020/11/04 17:16:13 1.5
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.c 2021/03/11 12:08:57 1.6
@@ -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);