aboutsummaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
Diffstat (limited to 'unix')
-rw-r--r--unix/vncconfig/vncconfig.cxx2
-rw-r--r--unix/x0vncserver/XDesktop.cxx2
-rw-r--r--unix/x0vncserver/x0vncserver.cxx2
-rw-r--r--unix/xserver/hw/vnc/XserverDesktop.cc20
-rw-r--r--unix/xserver/hw/vnc/vncExtInit.cc18
5 files changed, 22 insertions, 22 deletions
diff --git a/unix/vncconfig/vncconfig.cxx b/unix/vncconfig/vncconfig.cxx
index 1498bbdb..94d81cc7 100644
--- a/unix/vncconfig/vncconfig.cxx
+++ b/unix/vncconfig/vncconfig.cxx
@@ -336,7 +336,7 @@ int main(int argc, char** argv)
XCloseDisplay(dpy);
} catch (rdr::Exception &e) {
- vlog.error("%s", e.str());
+ vlog.error("%s", e.what());
}
return 0;
diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
index 1dc76718..a083e01e 100644
--- a/unix/x0vncserver/XDesktop.cxx
+++ b/unix/x0vncserver/XDesktop.cxx
@@ -1050,7 +1050,7 @@ bool XDesktop::setCursor()
server->setCursor(cim->width, cim->height, Point(cim->xhot, cim->yhot),
cursorData);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::setCursor: %s",e.str());
+ vlog.error("XserverDesktop::setCursor: %s",e.what());
}
delete [] cursorData;
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index fce32c74..cc668628 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -476,7 +476,7 @@ int main(int argc, char** argv)
}
} catch (rdr::Exception &e) {
- vlog.error("%s", e.str());
+ vlog.error("%s", e.what());
return 1;
}
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index e3bc57d8..7ad65d06 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -196,7 +196,7 @@ void XserverDesktop::requestClipboard()
try {
server->requestClipboard();
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::requestClipboard: %s",e.str());
+ vlog.error("XserverDesktop::requestClipboard: %s",e.what());
}
}
@@ -205,7 +205,7 @@ void XserverDesktop::announceClipboard(bool available)
try {
server->announceClipboard(available);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::announceClipboard: %s",e.str());
+ vlog.error("XserverDesktop::announceClipboard: %s",e.what());
}
}
@@ -214,7 +214,7 @@ void XserverDesktop::sendClipboardData(const char* data_)
try {
server->sendClipboardData(data_);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::sendClipboardData: %s",e.str());
+ vlog.error("XserverDesktop::sendClipboardData: %s",e.what());
}
}
@@ -233,7 +233,7 @@ void XserverDesktop::setDesktopName(const char* name)
try {
server->setName(name);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::setDesktopName: %s",e.str());
+ vlog.error("XserverDesktop::setDesktopName: %s",e.what());
}
}
@@ -268,7 +268,7 @@ void XserverDesktop::setCursor(int width, int height, int hotX, int hotY,
try {
server->setCursor(width, height, Point(hotX, hotY), cursorData);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::setCursor: %s",e.str());
+ vlog.error("XserverDesktop::setCursor: %s",e.what());
}
delete [] cursorData;
@@ -279,7 +279,7 @@ void XserverDesktop::setCursorPos(int x, int y, bool warped)
try {
server->setCursorPos(Point(x, y), warped);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::setCursorPos: %s",e.str());
+ vlog.error("XserverDesktop::setCursorPos: %s",e.what());
}
}
@@ -288,7 +288,7 @@ void XserverDesktop::add_changed(const rfb::Region &region)
try {
server->add_changed(region);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::add_changed: %s",e.str());
+ vlog.error("XserverDesktop::add_changed: %s",e.what());
}
}
@@ -297,7 +297,7 @@ void XserverDesktop::add_copied(const rfb::Region &dest, const rfb::Point &delta
try {
server->add_copied(dest, delta);
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::add_copied: %s",e.str());
+ vlog.error("XserverDesktop::add_copied: %s",e.what());
}
}
@@ -314,7 +314,7 @@ void XserverDesktop::handleSocketEvent(int fd, bool read, bool write)
vlog.error("Cannot find file descriptor for socket event");
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::handleSocketEvent: %s",e.str());
+ vlog.error("XserverDesktop::handleSocketEvent: %s",e.what());
}
}
@@ -407,7 +407,7 @@ void XserverDesktop::blockHandler(int* timeout)
if (nextTimeout >= 0 && (*timeout == -1 || nextTimeout < *timeout))
*timeout = nextTimeout;
} catch (rdr::Exception& e) {
- vlog.error("XserverDesktop::blockHandler: %s",e.str());
+ vlog.error("XserverDesktop::blockHandler: %s", e.what());
}
}
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 073b07e2..b39366a8 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -275,7 +275,7 @@ void vncExtensionInit(void)
vncHooksInit(scr);
}
} catch (rdr::Exception& e) {
- vncFatalError("vncExtInit: %s\n",e.str());
+ vncFatalError("vncExtInit: %s\n",e.what());
}
vncRegisterBlockHandlers();
@@ -289,7 +289,7 @@ void vncExtensionClose(void)
desktop[scr] = nullptr;
}
} catch (rdr::Exception& e) {
- vncFatalError("vncExtInit: %s\n",e.str());
+ vncFatalError("vncExtInit: %s\n",e.what());
}
}
@@ -349,7 +349,7 @@ int vncConnectClient(const char *addr, int viewOnly)
try {
desktop[0]->disconnectClients();
} catch (rdr::Exception& e) {
- vlog.error("Disconnecting all clients: %s",e.str());
+ vlog.error("Disconnecting all clients: %s", e.what());
return -1;
}
return 0;
@@ -366,7 +366,7 @@ int vncConnectClient(const char *addr, int viewOnly)
viewOnly ? " (view only)" : "");
desktop[0]->addClient(sock, true, (bool)viewOnly);
} catch (rdr::Exception& e) {
- vlog.error("Reverse connection: %s",e.str());
+ vlog.error("Reverse connection: %s", e.what());
return -1;
}
@@ -463,7 +463,7 @@ void vncPostScreenResize(int scrIdx, int success, int width, int height)
vncFbptr[scrIdx],
vncFbstride[scrIdx]);
} catch (rdr::Exception& e) {
- vncFatalError("vncPostScreenResize: %s\n", e.str());
+ vncFatalError("vncPostScreenResize: %s\n", e.what());
}
}
@@ -480,7 +480,7 @@ void vncRefreshScreenLayout(int scrIdx)
try {
desktop[scrIdx]->refreshScreenLayout();
} catch (rdr::Exception& e) {
- vncFatalError("vncRefreshScreenLayout: %s\n", e.str());
+ vncFatalError("vncRefreshScreenLayout: %s\n", e.what());
}
}
@@ -489,7 +489,7 @@ uint64_t vncGetMsc(int scrIdx)
try {
return desktop[scrIdx]->getMsc();
} catch (rdr::Exception& e) {
- vncFatalError("vncGetMsc: %s\n", e.str());
+ vncFatalError("vncGetMsc: %s\n", e.what());
}
}
@@ -498,7 +498,7 @@ void vncQueueMsc(int scrIdx, uint64_t id, uint64_t msc)
try {
desktop[scrIdx]->queueMsc(id, msc);
} catch (rdr::Exception& e) {
- vncFatalError("vncQueueMsc: %s\n", e.str());
+ vncFatalError("vncQueueMsc: %s\n", e.what());
}
}
@@ -507,7 +507,7 @@ void vncAbortMsc(int scrIdx, uint64_t id)
try {
desktop[scrIdx]->abortMsc(id);
} catch (rdr::Exception& e) {
- vncFatalError("vncAbortMsc: %s\n", e.str());
+ vncFatalError("vncAbortMsc: %s\n", e.what());
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 16:33:55 +0000