diff options
| author | speidy <speidy@gmail.com> | 2017-09-01 08:43:48 +0300 |
|---|---|---|
| committer | metalefty <meta@vmeta.jp> | 2017-09-13 11:18:41 +0900 |
| commit | d15d32c593eaccac1061adfa36742c163f7410cc (patch) | |
| tree | c3c20836bde550d0f51fbc2fd0ddae70b1e58298 | |
| parent | 26394870e5bd03e6ee15fa6083b2067b9c9106d2 (diff) | |
| download | xrdp-proprietary-d15d32c593eaccac1061adfa36742c163f7410cc.tar.gz xrdp-proprietary-d15d32c593eaccac1061adfa36742c163f7410cc.zip | |
xrdpapi: change WTSVirtualChannelWrite return values to be consistent with WTSVirtualChannelRead
| -rw-r--r-- | xrdpapi/xrdpapi.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/xrdpapi/xrdpapi.c b/xrdpapi/xrdpapi.c index e6242bec..320052ab 100644 --- a/xrdpapi/xrdpapi.c +++ b/xrdpapi/xrdpapi.c @@ -210,7 +210,7 @@ mysend(int sck, const void* adata, int bytes) /* * write data to client connection * - * @return 0 on success, -1 on error + * @return 1 on success, 0 on error *****************************************************************************/ int WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer, @@ -227,18 +227,18 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer, if (wts == 0) { LLOGLN(10, ("WTSVirtualChannelWrite: wts is NULL")); - return -1; + return 0; } if (wts->status != 1) { LLOGLN(10, ("WTSVirtualChannelWrite: wts->status != 1")); - return -1; + return 0; } if (!can_send(wts->fd, 0)) { - return 0; /* can't write now, ok to try again */ + return 1; /* can't write now, ok to try again */ } rv = 0; @@ -251,7 +251,7 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer, else { LLOGLN(0, ("WTSVirtualChannelWrite: header write failed")); - return -1; + return 0; } LLOGLN(10, ("WTSVirtualChannelWrite: mysend() returned %d", rv)); @@ -260,7 +260,7 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer, { /* success, but zero bytes may have been written */ *pBytesWritten = rv; - return 0; + return 1; } #if 0 /* coverity: this is dead code */ @@ -272,10 +272,14 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer, #endif /* fatal error */ - return -1; + return 0; } -/*****************************************************************************/ +/* + * read data from a client connection + * + * @return 1 on success, 0 on error + *****************************************************************************/ int WTSVirtualChannelRead(void *hChannelHandle, unsigned int TimeOut, char *Buffer, unsigned int BufferSize, |