diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-06-17 10:47:28 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-06-17 10:47:28 +0200 |
| commit | a9af1f12466e201fed5a72bbba2607fb55f7e042 (patch) | |
| tree | d43ec72d10ef65cb365fa9e2fc0b16f60c25f7ce | |
| parent | b64dbf29aeaaa41eed47ea48e3ccfa9ae563c6f2 (diff) | |
| download | tigervnc-a9af1f12466e201fed5a72bbba2607fb55f7e042.tar.gz tigervnc-a9af1f12466e201fed5a72bbba2607fb55f7e042.zip | |
Fix some bad signed/unsigned mismatches
| -rw-r--r-- | common/rfb/VNCSConnectionST.h | 2 | ||||
| -rw-r--r-- | unix/tx/TXWindow.cxx | 8 | ||||
| -rw-r--r-- | vncviewer/parameters.cxx | 4 | ||||
| -rw-r--r-- | win/rfb_win32/SInput.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/common/rfb/VNCSConnectionST.h b/common/rfb/VNCSConnectionST.h index bc6ae5bd..72ffc1df 100644 --- a/common/rfb/VNCSConnectionST.h +++ b/common/rfb/VNCSConnectionST.h @@ -186,7 +186,7 @@ namespace rfb { unsigned baseRTT; unsigned congWindow; - int ackedOffset, sentOffset; + unsigned ackedOffset, sentOffset; unsigned minRTT; bool seenCongestion; diff --git a/unix/tx/TXWindow.cxx b/unix/tx/TXWindow.cxx index 1f69702a..a6819179 100644 --- a/unix/tx/TXWindow.cxx +++ b/unix/tx/TXWindow.cxx @@ -89,11 +89,11 @@ void TXWindow::init(Display* dpy, const char* defaultWindowClass_) XSetFont(dpy, defaultGC, defaultFont); XSelectInput(dpy, DefaultRootWindow(dpy), PropertyChangeMask); - static char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06}; - dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), dotBits, + static unsigned char dotBits[] = { 0x06, 0x0f, 0x0f, 0x06}; + dot = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)dotBits, dotSize, dotSize); - static char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00}; - tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), tickBits, + static unsigned char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00}; + tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), (char*)tickBits, tickSize, tickSize); defaultWindowClass = rfb::strDup(defaultWindowClass_); } diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx index bf390103..7cce1cd7 100644 --- a/vncviewer/parameters.cxx +++ b/vncviewer/parameters.cxx @@ -182,7 +182,7 @@ static bool encodeValue(const char* val, char* dest, size_t destSize) { bool normalCharacter = true; size_t pos = 0; - for (int i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) { + for (size_t i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) { // Check for sequences which will need encoding if (val[i] == '\\') { @@ -229,7 +229,7 @@ static bool decodeValue(const char* val, char* dest, size_t destSize) { size_t pos = 0; bool escapedCharacter = false; - for (int i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) { + for (size_t i = 0; (val[i] != '\0') && (i < (destSize - 1)); i++) { // Check for escape sequences if (val[i] == '\\') { diff --git a/win/rfb_win32/SInput.cxx b/win/rfb_win32/SInput.cxx index f6345665..111a4d90 100644 --- a/win/rfb_win32/SInput.cxx +++ b/win/rfb_win32/SInput.cxx @@ -66,7 +66,7 @@ static DWORD buttonUpMapping[8] = { }; static DWORD buttonDataMapping[8] = { - 0, 0, 0, 120, -120, 0, 0, 0 + 0, 0, 0, 120, (DWORD)-120, 0, 0, 0 }; win32::SPointer::SPointer() |