Commit 7de7cb09 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Reconnect.c: save some lines

parent 64c95c0a
...@@ -460,19 +460,17 @@ Bool nxagentReconnectSession(void) ...@@ -460,19 +460,17 @@ Bool nxagentReconnectSession(void)
if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0) if (nxagentReconnectDisplay(reconnectLossyLevel[DISPLAY_STEP]) == 0)
{ {
failedStep = DISPLAY_STEP;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentReconnectSession: WARNING! Failed display reconnection.\n"); fprintf(stderr, "nxagentReconnectSession: WARNING! Failed display reconnection.\n");
#endif #endif
failedStep = DISPLAY_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
if (nxagentReconnectScreen(reconnectLossyLevel[SCREEN_STEP]) == 0) if (nxagentReconnectScreen(reconnectLossyLevel[SCREEN_STEP]) == 0)
{ {
failedStep = SCREEN_STEP; failedStep = SCREEN_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
...@@ -485,7 +483,6 @@ Bool nxagentReconnectSession(void) ...@@ -485,7 +483,6 @@ Bool nxagentReconnectSession(void)
if (nxagentReconnectFailedFonts(reconnectLossyLevel[FONT_STEP]) == 0) if (nxagentReconnectFailedFonts(reconnectLossyLevel[FONT_STEP]) == 0)
{ {
failedStep = FONT_STEP; failedStep = FONT_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
else else
...@@ -528,21 +525,18 @@ Bool nxagentReconnectSession(void) ...@@ -528,21 +525,18 @@ Bool nxagentReconnectSession(void)
if (nxagentReconnectAllGCs(reconnectLossyLevel[GC_STEP]) == 0) if (nxagentReconnectAllGCs(reconnectLossyLevel[GC_STEP]) == 0)
{ {
failedStep = GC_STEP; failedStep = GC_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
if (nxagentReconnectAllColormap(reconnectLossyLevel[COLORMAP_STEP]) == 0) if (nxagentReconnectAllColormap(reconnectLossyLevel[COLORMAP_STEP]) == 0)
{ {
failedStep = COLORMAP_STEP; failedStep = COLORMAP_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
if (nxagentReconnectAllWindows(reconnectLossyLevel[WINDOW_STEP]) == 0) if (nxagentReconnectAllWindows(reconnectLossyLevel[WINDOW_STEP]) == 0)
{ {
failedStep = WINDOW_STEP; failedStep = WINDOW_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
...@@ -551,21 +545,18 @@ Bool nxagentReconnectSession(void) ...@@ -551,21 +545,18 @@ Bool nxagentReconnectSession(void)
if (nxagentReconnectAllGlyphSet(reconnectLossyLevel[GLYPHSET_STEP]) == 0) if (nxagentReconnectAllGlyphSet(reconnectLossyLevel[GLYPHSET_STEP]) == 0)
{ {
failedStep = GLYPHSET_STEP; failedStep = GLYPHSET_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
if (nxagentReconnectAllPictFormat(reconnectLossyLevel[PICTFORMAT_STEP]) == 0) if (nxagentReconnectAllPictFormat(reconnectLossyLevel[PICTFORMAT_STEP]) == 0)
{ {
failedStep = PICTFORMAT_STEP; failedStep = PICTFORMAT_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
if (nxagentReconnectAllPicture(reconnectLossyLevel[PICTURE_STEP]) == 0) if (nxagentReconnectAllPicture(reconnectLossyLevel[PICTURE_STEP]) == 0)
{ {
failedStep = PICTURE_STEP; failedStep = PICTURE_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
} }
...@@ -573,14 +564,12 @@ Bool nxagentReconnectSession(void) ...@@ -573,14 +564,12 @@ Bool nxagentReconnectSession(void)
if (nxagentReconnectAllCursor(reconnectLossyLevel[CURSOR_STEP]) == 0) if (nxagentReconnectAllCursor(reconnectLossyLevel[CURSOR_STEP]) == 0)
{ {
failedStep = CURSOR_STEP; failedStep = CURSOR_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
if (nxagentSetWindowCursors(reconnectLossyLevel[WINDOW_STEP]) == 0) if (nxagentSetWindowCursors(reconnectLossyLevel[WINDOW_STEP]) == 0)
{ {
failedStep = WINDOW_STEP; failedStep = WINDOW_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
...@@ -616,7 +605,6 @@ Bool nxagentReconnectSession(void) ...@@ -616,7 +605,6 @@ Bool nxagentReconnectSession(void)
#endif #endif
failedStep = WINDOW_STEP; failedStep = WINDOW_STEP;
goto nxagentReconnectError; goto nxagentReconnectError;
} }
} }
...@@ -856,4 +844,3 @@ void nxagentHandleConnectionChanges(void) ...@@ -856,4 +844,3 @@ void nxagentHandleConnectionChanges(void)
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment