Commit 64c95c0a authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Reconnect.c: reformat comments

parent cf2bd1cf
...@@ -236,8 +236,7 @@ int nxagentHandleConnectionStates(void) ...@@ -236,8 +236,7 @@ int nxagentHandleConnectionStates(void)
fprintf(stderr, "nxagentHandleConnectionStates: Got I/O error in the exception flags.\n"); fprintf(stderr, "nxagentHandleConnectionStates: Got I/O error in the exception flags.\n");
#endif #endif
/* /*
TODO: This should be reset only when TODO: This should be reset only when the state became SESSION_DOWN.
the state became SESSION_DOWN.
*/ */
nxagentException.ioError = 0; nxagentException.ioError = 0;
...@@ -364,8 +363,7 @@ void nxagentDisconnectSession(void) ...@@ -364,8 +363,7 @@ void nxagentDisconnectSession(void)
nxagentFreeTimeoutTimer(); nxagentFreeTimeoutTimer();
/* /*
* Force an I/O error on the display * Force an I/O error on the display and wait until the NX transport
* and wait until the NX transport
* is gone. * is gone.
*/ */
...@@ -426,16 +424,15 @@ Bool nxagentReconnectSession(void) ...@@ -426,16 +424,15 @@ Bool nxagentReconnectSession(void)
nxagentChangeOption(DeviceControl, nxagentOption(DeviceControlUserDefined)); nxagentChangeOption(DeviceControl, nxagentOption(DeviceControlUserDefined));
/* /*
* We need to zero out every new XID * We need to zero out every new XID created by the disconnected
* created by the disconnected display. * display.
*/ */
nxagentDisconnectSession(); nxagentDisconnectSession();
/* /*
* Set this in order to let the screen * Set this in order to let the screen function to behave
* function to behave differently at * differently at reconnection time.
* reconnection time.
*/ */
nxagentReconnectTrap = True; nxagentReconnectTrap = True;
...@@ -503,16 +500,15 @@ Bool nxagentReconnectSession(void) ...@@ -503,16 +500,15 @@ Bool nxagentReconnectSession(void)
} }
/* /*
* Map the main window and send a * Map the main window and send a SetSelectionOwner request to
* SetSelectionOwner request to
* notify of the agent start. * notify of the agent start.
*/ */
nxagentMapDefaultWindows(); nxagentMapDefaultWindows();
/* /*
* Ensure that the SetSelectionOwner * Ensure that the SetSelectionOwner request is sent through the
* request is sent through the link. * link.
*/ */
XFlush(nxagentDisplay); XFlush(nxagentDisplay);
...@@ -682,10 +678,9 @@ Bool nxagentReconnectSession(void) ...@@ -682,10 +678,9 @@ Bool nxagentReconnectSession(void)
nxagentRemoveSplashWindow(); nxagentRemoveSplashWindow();
/* /*
* We let the proxy flush the link on our behalf * We let the proxy flush the link on our behalf after having opened
* after having opened the display. We are now * the display. We are now entering again the dispatcher so can
* entering again the dispatcher so can flush * flush the link explicitly.
* the link explicitly.
*/ */
#ifdef TEST #ifdef TEST
...@@ -798,9 +793,8 @@ void nxagentSetReconnectError(int id, char *format, ...) ...@@ -798,9 +793,8 @@ void nxagentSetReconnectError(int id, char *format, ...)
else else
{ {
/* /*
* The vsnprintf() in glibc 2.0.6 would return * The vsnprintf() in glibc 2.0.6 would return -1 when the
* -1 when the output was truncated. See section * output was truncated. See section NOTES on printf(3).
* NOTES on printf(3).
*/ */
size = (size ? size * 2 : NXAGENT_RECONNECT_DEFAULT_MESSAGE_SIZE); size = (size ? size * 2 : NXAGENT_RECONNECT_DEFAULT_MESSAGE_SIZE);
......
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