[X2Go-Commits] [nx-libs] 142/429: nxagent: improve Boolean handling for Reconnect functions

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 99ca67c2ff080354c569dbb6f8e8ca611ffe7506
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Dec 31 00:14:35 2020 +0100

    nxagent: improve Boolean handling for Reconnect functions
---
 nx-X11/programs/Xserver/hw/nxagent/Display.c   | 14 +++++++-------
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 26 +++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index c8a2d852a..90f4cc1b0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -2517,7 +2517,7 @@ Bool nxagentReconnectDisplay(void *p0)
     nxagentSetReconnectError(FAILED_RESUME_DISPLAY_ALERT,
                                  "Couldn't open the display.");
 
-    return FALSE;
+    return False;
   }
 
   nxagentAddXConnection();
@@ -2535,12 +2535,12 @@ Bool nxagentReconnectDisplay(void *p0)
 
   #endif
 
-  if (nxagentCheckForDefaultDepthCompatibility() == 0)
+  if (!nxagentCheckForDefaultDepthCompatibility())
   {
     nxagentSetReconnectError(FAILED_RESUME_DISPLAY_ALERT,
                                  "Default display depth doesn't match.");
 
-    return FALSE;
+    return False;
   }
 
   nxagentUseNXTrans = nxagentPostProcessArgs(nxagentDisplayName, nxagentDisplay,
@@ -2557,12 +2557,12 @@ Bool nxagentReconnectDisplay(void *p0)
    * Init and compare the visuals.
    */
 
-  if (nxagentInitAndCheckVisuals(flexibility) == FALSE)
+  if (!nxagentInitAndCheckVisuals(flexibility))
   {
     nxagentSetReconnectError(FAILED_RESUME_VISUALS_ALERT,
                                  "Couldn't restore the required visuals.");
 
-    return FALSE;
+    return False;
   }
 
   reconnectDisplayState = GOT_VISUAL_INFO;
@@ -2612,7 +2612,7 @@ Bool nxagentReconnectDisplay(void *p0)
 
   reconnectDisplayState = GOT_DEPTH_LIST;
 
-  if (nxagentCheckForDepthsCompatibility() == 0)
+  if (!nxagentCheckForDepthsCompatibility())
   {
     nxagentSetReconnectError(FAILED_RESUME_DEPTHS_ALERT,
                                  "Couldn't restore all the required depths.");
@@ -2634,7 +2634,7 @@ Bool nxagentReconnectDisplay(void *p0)
 
   nxagentInitPixmapFormats();
 
-  if (nxagentCheckForPixmapFormatsCompatibility() == 0)
+  if (!nxagentCheckForPixmapFormatsCompatibility())
   {
     nxagentSetReconnectError(FAILED_RESUME_PIXMAPS_ALERT,
                                  "Couldn't restore all the required pixmap formats.");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 03ac9effd..101796748 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -458,7 +458,7 @@ Bool nxagentReconnectSession(void)
   nxagentProcessOptions(nxagentOptionsFilenameOrString);
 
 
-  if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0)
+  if (!nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]))
   {
     #ifdef TEST
     fprintf(stderr, "nxagentReconnectSession: WARNING! Failed display reconnection.\n");
@@ -468,7 +468,7 @@ Bool nxagentReconnectSession(void)
     goto nxagentReconnectError;
   }
 
-  if (nxagentReconnectScreen(reconnectLossyLevel[SCREEN_STEP]) == 0)
+  if (!nxagentReconnectScreen(reconnectLossyLevel[SCREEN_STEP]))
   {
     failedStep = SCREEN_STEP;
     goto nxagentReconnectError;
@@ -478,9 +478,9 @@ Bool nxagentReconnectSession(void)
 
   nxagentListRemoteFonts("*", nxagentMaxFontNames);
 
-  if (nxagentReconnectAllFonts(reconnectLossyLevel[FONT_STEP]) == 0)
+  if (!nxagentReconnectAllFonts(reconnectLossyLevel[FONT_STEP]))
   {
-    if (nxagentReconnectFailedFonts(reconnectLossyLevel[FONT_STEP]) == 0)
+    if (!nxagentReconnectFailedFonts(reconnectLossyLevel[FONT_STEP]))
     {
       failedStep = FONT_STEP;
       goto nxagentReconnectError;
@@ -515,26 +515,26 @@ Bool nxagentReconnectSession(void)
   nxagentEmptyBSPixmapList();
 
   /* FIXME: nxagentReconnectAllPixmaps will always return 1 */
-  if (nxagentReconnectAllPixmaps(reconnectLossyLevel[PIXMAP_STEP]) == 0)
+  if (!nxagentReconnectAllPixmaps(reconnectLossyLevel[PIXMAP_STEP]))
   {
     failedStep = PIXMAP_STEP;
 
     goto nxagentReconnectError;
   }
 
-  if (nxagentReconnectAllGCs(reconnectLossyLevel[GC_STEP]) == 0)
+  if (!nxagentReconnectAllGCs(reconnectLossyLevel[GC_STEP]))
   {
     failedStep = GC_STEP;
     goto nxagentReconnectError;
   }
 
-  if (nxagentReconnectAllColormap(reconnectLossyLevel[COLORMAP_STEP]) == 0)
+  if (!nxagentReconnectAllColormap(reconnectLossyLevel[COLORMAP_STEP]))
   {
     failedStep = COLORMAP_STEP;
     goto nxagentReconnectError;
   }
 
-  if (nxagentReconnectAllWindows(reconnectLossyLevel[WINDOW_STEP]) == 0)
+  if (!nxagentReconnectAllWindows(reconnectLossyLevel[WINDOW_STEP]))
   {
     failedStep = WINDOW_STEP;
     goto nxagentReconnectError;
@@ -542,32 +542,32 @@ Bool nxagentReconnectSession(void)
 
   if (nxagentRenderEnable)
   {
-    if (nxagentReconnectAllGlyphSet(reconnectLossyLevel[GLYPHSET_STEP]) == 0)
+    if (!nxagentReconnectAllGlyphSet(reconnectLossyLevel[GLYPHSET_STEP]))
     {
       failedStep = GLYPHSET_STEP;
       goto nxagentReconnectError;
     }
 
-    if (nxagentReconnectAllPictFormat(reconnectLossyLevel[PICTFORMAT_STEP]) == 0)
+    if (!nxagentReconnectAllPictFormat(reconnectLossyLevel[PICTFORMAT_STEP]))
     {
       failedStep = PICTFORMAT_STEP;
       goto nxagentReconnectError;
     }
 
-    if (nxagentReconnectAllPicture(reconnectLossyLevel[PICTURE_STEP]) == 0)
+    if (!nxagentReconnectAllPicture(reconnectLossyLevel[PICTURE_STEP]))
     {
       failedStep = PICTURE_STEP;
       goto nxagentReconnectError;
     }
   }
 
-  if (nxagentReconnectAllCursor(reconnectLossyLevel[CURSOR_STEP]) == 0)
+  if (!nxagentReconnectAllCursor(reconnectLossyLevel[CURSOR_STEP]))
   {
     failedStep = CURSOR_STEP;
     goto nxagentReconnectError;
   }
 
-  if (nxagentSetWindowCursors(reconnectLossyLevel[WINDOW_STEP]) == 0)
+  if (!nxagentSetWindowCursors(reconnectLossyLevel[WINDOW_STEP]))
   {
     failedStep = WINDOW_STEP;
     goto nxagentReconnectError;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git