Merge branch 'uli42-pr/some_cleanups' into 3.6.x

Attributes GH PR #626: https://github.com/ArcticaProject/nx-libs/pull/626

1 files changed, 7 insertions, 7 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Split.c b/nx-X11/programs/Xserver/hw/nxagent/Split.c
index 9b9691b02..f66a97a2c 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
 
@@ -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);