diff options
author | Pierre Ossman <ossman@cendio.se> | 2015-03-03 16:34:56 +0100 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2015-03-03 16:34:56 +0100 |
commit | fb450fba5d8737310a1f205ea3d38467dedf6afa (patch) | |
tree | 64408b35ce3d358703ff928975eebd4be319b5ba /vncviewer | |
parent | 64624342d98c62563c2a78b117ce3fcea9b61e68 (diff) | |
download | tigervnc-fb450fba5d8737310a1f205ea3d38467dedf6afa.tar.gz tigervnc-fb450fba5d8737310a1f205ea3d38467dedf6afa.zip |
Fix mismatches between format string and arguments
Diffstat (limited to 'vncviewer')
-rw-r--r-- | vncviewer/CConn.cxx | 2 | ||||
-rw-r--r-- | vncviewer/Viewport.cxx | 2 | ||||
-rw-r--r-- | vncviewer/parameters.cxx | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx index ab5c9ccc..f8b45af2 100644 --- a/vncviewer/CConn.cxx +++ b/vncviewer/CConn.cxx @@ -411,7 +411,7 @@ void CConn::serverCutText(const char* str, rdr::U32 len) ret = fl_utf8froma(buffer, size, str, len); assert(ret < size); - vlog.debug("Got clipboard data (%d bytes)", strlen(buffer)); + vlog.debug("Got clipboard data (%d bytes)", (int)strlen(buffer)); // RFB doesn't have separate selection and clipboard concepts, so we // dump the data into both variants. diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx index 6c77e583..3d6f4a84 100644 --- a/vncviewer/Viewport.cxx +++ b/vncviewer/Viewport.cxx @@ -351,7 +351,7 @@ int Viewport::handle(int event) Fl::event_length() + 1); assert(ret < (Fl::event_length() + 1)); - vlog.debug("Sending clipboard data (%d bytes)", strlen(buffer)); + vlog.debug("Sending clipboard data (%d bytes)", (int)strlen(buffer)); try { cc->writer()->clientCutText(buffer, ret); diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx index 29a5397d..713ac070 100644 --- a/vncviewer/parameters.cxx +++ b/vncviewer/parameters.cxx @@ -303,7 +303,7 @@ static void setKeyString(const char *_name, const char *_value, HKEY* hKey) { LONG res = RegSetValueExW(*hKey, name, 0, REG_SZ, (BYTE*)&value, (wcslen(value)+1)*2); if (res != ERROR_SUCCESS) { - vlog.error(_("Failed to write parameter %s of type %s to the registry: %d"), + vlog.error(_("Failed to write parameter %s of type %s to the registry: %ld"), _name, "REG_SZ", res); return; } @@ -324,7 +324,7 @@ static void setKeyInt(const char *_name, const int _value, HKEY* hKey) { LONG res = RegSetValueExW(*hKey, name, 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD)); if (res != ERROR_SUCCESS) { - vlog.error(_("Failed to write parameter %s of type %s to the registry: %d"), + vlog.error(_("Failed to write parameter %s of type %s to the registry: %ld"), _name, "REG_DWORD", res); return; } @@ -348,7 +348,7 @@ static bool getKeyString(const char* _name, char* dest, size_t destSize, HKEY* h if (res == ERROR_FILE_NOT_FOUND) { // The value does not exist, defaults will be used. } else { - vlog.error(_("Failed to read parameter %s from the registry: %d"), + vlog.error(_("Failed to read parameter %s from the registry: %ld"), _name, res); } return false; @@ -387,7 +387,7 @@ static bool getKeyInt(const char* _name, int* dest, HKEY* hKey) { if (res == ERROR_FILE_NOT_FOUND) { // The value does not exist, defaults will be used. } else { - vlog.error(_("Failed to read parameter %s from the registry: %d"), + vlog.error(_("Failed to read parameter %s from the registry: %ld"), _name, res); } return false; @@ -407,7 +407,7 @@ static void saveToReg(const char* servername) { REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, NULL); if (res != ERROR_SUCCESS) { - vlog.error(_("Failed to create registry key: %d"), res); + vlog.error(_("Failed to create registry key: %ld"), res); return; } @@ -428,7 +428,7 @@ static void saveToReg(const char* servername) { res = RegCloseKey(hKey); if (res != ERROR_SUCCESS) { - vlog.error(_("Failed to close registry key: %d"), res); + vlog.error(_("Failed to close registry key: %ld"), res); } } @@ -444,7 +444,7 @@ static char* loadFromReg() { if (res == ERROR_FILE_NOT_FOUND) { // The key does not exist, defaults will be used. } else { - vlog.error(_("Failed to open registry key: %d"), res); + vlog.error(_("Failed to open registry key: %ld"), res); } return NULL; } @@ -477,7 +477,7 @@ static char* loadFromReg() { res = RegCloseKey(hKey); if (res != ERROR_SUCCESS){ - vlog.error(_("Failed to close registry key: %d"), res); + vlog.error(_("Failed to close registry key: %ld"), res); } return servername; |