Changeset 43411 in vbox

Timestamp:

Sep 22, 2012 6:42:16 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80897

Message:

Additions/haiku: cleanup.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-haiku-stubs.c (modified) (1 diff)
• VBoxGuest-haiku.c (modified) (4 diffs)
• VBoxGuest-haiku.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku-stubs.c

@@ -446 +446 @@
     g_VBoxGuest->_RTHeapSimpleFree(Heap, pv);
 }
+

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.c

@@ -394 +394 @@
     if (RT_FAILURE(rc))
     {
-        /** @todo r=ramshankar: use dprintf here & the error code looks wrong too. */
+        /** @todo r=ramshankar: use dprintf here. */
         LogFunc(("RTR0Init failed.\n"));
         return ENXIO;
@@ -499 +499 @@
     int ix = 0;
 
-    if (get_module(B_PCI_MODULE_NAME, (module_info **)&gPCI))
-        return ENOSYS;
+    err = get_module(B_PCI_MODULE_NAME, (module_info **)&gPCI);
+    if (err != B_OK)
+        return err;
 
     while ((*gPCI->get_nth_pci_info)(ix++, &info) == B_OK)
@@ -506 +507 @@
         if (VBoxGuestHaikuProbe(&info) == 0)
         {
-            /* we found it */
+            /* We found it */
             err = VBoxGuestHaikuAttach(&info);
-            break;
+            return err;
         }
     }
 
-    return err;
+    return B_ENTRY_NOT_FOUND;
 }
 
@@ -528 +529 @@
     {
         case B_MODULE_INIT:
-            dprintf(MODULE_NAME ": B_MODULE_INIT\n");
             return init_module();
+
         case B_MODULE_UNINIT:
-            dprintf(MODULE_NAME ": B_MODULE_UNINIT\n");
+        {
             uninit_module();
             return B_OK;
+        }
+
         default:
             return B_ERROR;

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-haiku.h

@@ -223 +223 @@
 #endif
 
-#endif
+#endif /* ___VBoxGuest_haiku_h */
+