Changeset 52231 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 29, 2014 7:54:57 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: make fatal error notification application-global.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• VBoxClient.h (modified) (1 diff)
• display.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -19 +19 @@
 # define ___vboxclient_vboxclient_h
 
+#include <VBox/log.h>
 #include <iprt/cpp/utils.h>
+#include <iprt/string.h>
+
+/** Exit with a fatal error. */
+#define FatalError(format) \
+do { \
+    char *pszMessage = RTStrAPrintf2 format; \
+    LogRel(format); \
+    doFatalError(pszMessage); \
+} while(0)
+
+/** Exit with a fatal error. */
+extern void doFatalError(char *pszMessage);
 
 /** Namespace for VBoxClient-specific things */

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -57 +57 @@
     long *paSizeHints;
 };
-
-/** Exit with a fatal error.
- * @todo Make this application global. */
-#define FatalError(format) \
-do { \
-    char *pszMessage = RTStrAPrintf2 format; \
-    LogRel(format); \
-    doFatalError(pszMessage); \
-} while(0)
-
-static void doFatalError(char *pszMessage)
-{
-    char *pszCommand;
-    if (pszMessage)
-    {
-        pszCommand = RTStrAPrintf2("notify-send \"VBoxClient: %s\"",
-                                   pszMessage);
-        if (pszCommand)
-            system(pszCommand);
-    }
-    exit(1);
-}
 
 /** Tell the VBoxGuest driver we no longer want any events and tell the host

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -60 +60 @@
  */
 RTCRITSECT g_critSect;
+
+/** Exit with a fatal error. */
+void doFatalError(char *pszMessage)
+{
+    char *pszCommand;
+    if (pszMessage)
+    {
+        pszCommand = RTStrAPrintf2("notify-send \"VBoxClient: %s\"",
+                                   pszMessage);
+        if (pszCommand)
+            system(pszCommand);
+    }
+    exit(1);
+}
 
 /** Clean up if we get a signal or something.  This is extern so that we