aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-10-29 01:13:34 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-11-15 12:14:57 +0100
commit6c44480deab3380bb7278a74319bbc8c6d0e6359 (patch)
tree8df75225d8459a27c9886f51c743691b9d325524
parent0535c49cac55d931c9d5b4178db050e6f6e543cf (diff)
downloadnx-libs-6c44480deab3380bb7278a74319bbc8c6d0e6359.tar.gz
nx-libs-6c44480deab3380bb7278a74319bbc8c6d0e6359.tar.bz2
nx-libs-6c44480deab3380bb7278a74319bbc8c6d0e6359.zip
Pixmap.c: drop code that does not make sense
This check has already been done before we reach here. Also add some comments about a condition that will never occur...
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pixmap.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 371678d0e..5358bd37e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -699,6 +699,7 @@ Bool nxagentDisconnectAllPixmaps(void)
#ifdef WARNING
+ /* Note: nxagentDisconnectPixmap() does not modify r - so this check can never succeed */
if (r == 0)
{
fprintf(stderr, "nxagentDisconnectAllPixmaps: WARNING! Failed to disconnect "
@@ -719,6 +720,7 @@ Bool nxagentDisconnectAllPixmaps(void)
#ifdef WARNING
+ /* Note: nxagentDisconnectPixmap() does not modify r - so this check can never succeed */
if (r == 0)
{
fprintf(stderr, "nxagentDisconnectAllPixmaps: WARNING! Failed to disconnect "
@@ -729,16 +731,6 @@ Bool nxagentDisconnectAllPixmaps(void)
}
}
- #ifdef WARNING
-
- if (r == 0)
- {
- fprintf(stderr, "nxagentDisconnectAllPixmaps: WARNING! Failed to disconnect "
- "pixmap for client [%d].\n", i);
- }
-
- #endif
-
#ifdef TEST
fprintf(stderr, "nxagentDisconnectAllPixmaps: Pixmaps disconnection completed.\n");
#endif