From e3d749f681b9a1c597afa032ffb372c9e4b6278e Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 5 Jan 2018 01:44:58 +0100 Subject: Split.c: Fix wrong function names in TEST output --- nx-X11/programs/Xserver/hw/nxagent/Split.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Split.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index 9b9691b02..b8fc69819 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -492,14 +492,14 @@ void nxagentReleaseSplit(DrawablePtr pDrawable) "commits are invalid.\n", pResource -> split); #endif - FatalError("nxagentCheckSplit: PANIC! Found a region for resource [%d] but the " + FatalError("nxagentReleaseSplit: PANIC! Found a region for resource [%d] but the " "commits are invalid.\n", pResource -> split); } #endif #ifdef TEST - fprintf(stderr, "nxagentValidateSplit: Aborting the data transfer for resource [%d].\n", + fprintf(stderr, "nxagentReleaseSplit: Aborting the data transfer for resource [%d].\n", pResource -> split); #endif -- cgit v1.2.3 From ffc363c54398ce24419d6e8dc15f054213aa0645 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 5 Jan 2018 01:45:15 +0100 Subject: Split.c: make nxagentWaitDrawable TEST messages look like all the others --- nx-X11/programs/Xserver/hw/nxagent/Split.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Split.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c index b8fc69819..f66a97a2c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Split.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Split.c @@ -734,7 +734,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) if (pResource == NULL) { #ifdef TEST - fprintf(stderr, "++++++nxagentWaitDrawable: WARNING! The drawable at [%p] is already awake.\n", + fprintf(stderr, "nxagentWaitDrawable: WARNING! The drawable at [%p] is already awake.\n", (void *) pDrawable); #endif @@ -742,7 +742,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) } #ifdef TEST - fprintf(stderr, "++++++nxagentWaitDrawable: Waiting drawable at [%p] with resource [%d].\n", + fprintf(stderr, "nxagentWaitDrawable: Waiting drawable at [%p] with resource [%d].\n", (void *) pDrawable, pResource -> split); #endif @@ -786,12 +786,12 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) if (NXDisplayError(nxagentDisplay) == 1) { - fprintf(stderr, "++++++nxagentWaitDrawable: WARNING! Display error detected while " + fprintf(stderr, "nxagentWaitDrawable: WARNING! Display error detected while " "waiting for the drawable.\n"); } else { - fprintf(stderr, "++++++nxagentWaitDrawable: Drawable at [%p] can now be restarted.\n", + fprintf(stderr, "nxagentWaitDrawable: Drawable at [%p] can now be restarted.\n", (void *) pDrawable); } @@ -801,7 +801,7 @@ void nxagentWaitDrawable(DrawablePtr pDrawable) } #ifdef TEST - fprintf(stderr, "++++++nxagentWaitDrawable: Yielding control to the NX transport.\n"); + fprintf(stderr, "nxagentWaitDrawable: Yielding control to the NX transport.\n"); #endif nxagentWaitEvents(nxagentDisplay, NULL); -- cgit v1.2.3