From 9eca28a0847756cc029f122396cd5b8cfb38fd04 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sat, 23 May 2020 12:16:50 +0200 Subject: [PATCH] Add final line break to FatalError() calls It expects the callers to include this, so make sure we're consistently providing one. --- unix/xserver/hw/vnc/vncExtInit.cc | 10 +++++----- unix/xserver/hw/vnc/xvnc.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc index 103a13f..633a569 100644 --- a/unix/xserver/hw/vnc/vncExtInit.cc +++ b/unix/xserver/hw/vnc/vncExtInit.cc @@ -155,10 +155,10 @@ void vncExtensionInit(void) vncExtGeneration = vncGetServerGeneration(); if (vncGetScreenCount() > MAXSCREENS) - vncFatalError("vncExtensionInit: too many screens"); + vncFatalError("vncExtensionInit: too many screens\n"); if (sizeof(ShortRect) != sizeof(struct UpdateRect)) - vncFatalError("vncExtensionInit: Incompatible ShortRect size"); + vncFatalError("vncExtensionInit: Incompatible ShortRect size\n"); vncAddExtension(); @@ -264,7 +264,7 @@ void vncExtensionInit(void) vncHooksInit(scr); } } catch (rdr::Exception& e) { - vncFatalError("vncExtInit: %s",e.str()); + vncFatalError("vncExtInit: %s\n",e.str()); } vncRegisterBlockHandlers(); @@ -278,7 +278,7 @@ void vncExtensionClose(void) desktop[scr] = NULL; } } catch (rdr::Exception& e) { - vncFatalError("vncExtInit: %s",e.str()); + vncFatalError("vncExtInit: %s\n",e.str()); } } @@ -447,7 +447,7 @@ void vncRefreshScreenLayout(int scrIdx) try { desktop[scrIdx]->refreshScreenLayout(); } catch (rdr::Exception& e) { - vncFatalError("%s", e.str()); + vncFatalError("vncRefreshScreenLayout: %s\n", e.str()); } } diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index c1e3ea0..9bea769 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -596,7 +596,7 @@ ddxProcessArgument(int argc, char *argv[], int i) if (displayNumFree(displayNum)) break; if (displayNum == 100) - FatalError("Xvnc error: no free display number for -inetd"); + FatalError("Xvnc error: no free display number for -inetd\n"); } display = displayNumStr; @@ -1794,7 +1794,7 @@ InitOutput(ScreenInfo *scrInfo, int argc, char **argv) { if (-1 == AddScreen(vfbScreenInit, argc, argv)) { - FatalError("Couldn't add screen %d", i); + FatalError("Couldn't add screen %d\n", i); } }