Changeset 30601 in vbox

Timestamp:

Jul 5, 2010 11:22:54 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService: VBoxServicePageSharingInitFork shouldn't return void. Why don't the compilers throw an error on this?

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServicePageSharing.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -289 +289 @@
 #endif
 #if defined(VBOX_WITH_PAGE_SHARING) && defined(RT_OS_WINDOWS)
-extern void VBoxServicePageSharingInitFork();
+extern RTEXITCODE VBoxServicePageSharingInitFork(void);
 #endif
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -607 +607 @@
 
 #ifdef RT_OS_WINDOWS
-void VBoxServicePageSharingInitFork()
+
+/**
+ * This gets control when VBoxService is launched with -pagefusionfork by
+ * VBoxServicePageSharingWorkerProcess().
+ *
+ * @returns RTEXITCODE_SUCCESS.
+ *
+ * @remarks It won't normally return since the parent drops the shutdown hint
+ *          via RTProcTerminate().
+ */
+RTEXITCODE VBoxServicePageSharingInitFork(void)
 {
     VBoxServiceVerbose(3, "VBoxServicePageSharingInitFork\n");
@@ -614 +624 @@
     VBoxServicePageSharingInit();
     VBoxServicePageSharingWorker(&fShutdown);
+
+    return RTEXITCODE_SUCCESS;
 }
 
@@ -649 +661 @@
                 pszArgs[1] = "-pagefusionfork";
                 pszArgs[2] = NULL;
-                /* Start a 2nd VBoxService process to deal with page fusion as we do not wish to dummy load 
+                /* Start a 2nd VBoxService process to deal with page fusion as we do not wish to dummy load
                  * dlls into this process. (first load with DONT_RESOLVE_DLL_REFERENCES, 2nd normal -> dll init routines not called!)
                  */
@@ -686 +698 @@
 }
 
-#endif
+#endif /* RT_OS_WINDOWS */
 
 /** @copydoc VBOXSERVICE::pfnTerm */