diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2020-02-04 19:15:47 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 14:57:21 +0200 |
| commit | 52a458282a50bf54b54eacf071a15a26ab6e8547 (patch) | |
| tree | 139db2bc575de89ff996d9901da4015c5f6babc9 | |
| parent | 17ab45b921c2e17437d585cb3e9d62ca73ab04c5 (diff) | |
| download | nx-libs-52a458282a50bf54b54eacf071a15a26ab6e8547.tar.gz nx-libs-52a458282a50bf54b54eacf071a15a26ab6e8547.tar.bz2 nx-libs-52a458282a50bf54b54eacf071a15a26ab6e8547.zip | |
XlibInt.c: simplify NX code insertion
| -rw-r--r-- | nx-X11/lib/src/XlibInt.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/nx-X11/lib/src/XlibInt.c b/nx-X11/lib/src/XlibInt.c index 0c27f34da..5a481c9ab 100644 --- a/nx-X11/lib/src/XlibInt.c +++ b/nx-X11/lib/src/XlibInt.c @@ -530,7 +530,6 @@ _XWaitForWritable( #ifdef NX_TRANS_SOCKET { _XIOError(dpy); - return; } #else /* NX_TRANS_SOCKET */ @@ -996,7 +995,7 @@ static void _XFlushInt( if (dpy->flags & XlibDisplayIOError) { #ifdef NX_TRANS_DEBUG - fprintf(stderr, "_XFlushInt: Returning with I/O error detected.\n"); + fprintf(stderr, "_XFlushInt: Returning with I/O error detected.\n"); #endif dpy->bufptr = dpy->buffer; dpy->last_req = (char *)&_dummy_request; @@ -1186,7 +1185,6 @@ _XEventsQueued( #ifdef NX_TRANS_SOCKET { _XIOError(dpy); - return (dpy->qlen); } #else @@ -1229,7 +1227,6 @@ _XEventsQueued( #ifdef NX_TRANS_SOCKET { _XIOError(dpy); - return (dpy->qlen); } #else @@ -1591,12 +1588,10 @@ int _XRead( else if (bytes_read == 0) { /* Read failed because of end of file! */ ESET(EPIPE); -#ifdef NX_TRANS_SOCKET - _XIOError(dpy); - return -1; -#else _XIOError(dpy); +#ifdef NX_TRANS_SOCKET + return -1; #endif } @@ -1797,8 +1792,8 @@ _XSend ( #ifdef NX_TRANS_SOCKET #ifdef NX_TRANS_DEBUG - fprintf(stderr, "_XSend: Sending data with [%d] bytes to write.\n", - (dpy->bufptr - dpy->buffer)); + fprintf(stderr, "_XSend: Sending data with [%d] bytes to write.\n", + (dpy->bufptr - dpy->buffer)); #endif if (!size || (dpy->flags & XlibDisplayIOError)) { |