Changeset 23893 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Oct 20, 2009 8:59:51 AM (15 years ago)

Author:

vboxsync

Message:

VBoxGuestR3LibMisc.cpp: uninitialized return value

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp

@@ -207 +207 @@
 VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev)
 {
-    int rc;
+    int rc = VINF_SUCCESS;
 #ifdef RT_OS_WINDOWS
     HKEY hKey;
@@ -214 +214 @@
     /* Check the new path first. */
     r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
-#ifdef RT_ARCH_AMD64
+# ifdef RT_ARCH_AMD64
     if (r != ERROR_SUCCESS)
     {
@@ -220 +220 @@
         r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
     }
-#endif
+# endif
 
     /* Still no luck? Then try the old xVM paths ... */
@@ -226 +226 @@
     {
         r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
-#ifdef RT_ARCH_AMD64
+# ifdef RT_ARCH_AMD64
         if (r != ERROR_SUCCESS)
         {
@@ -232 +232 @@
             r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
         }
-#endif
+# endif
     }
 
@@ -265 +265 @@
     if (NULL != hKey)
         RegCloseKey(hKey);
-#else
+#else /* !RT_OS_WINDOWS */
     /* On non-Windows platforms just return the compile-time version string atm. */
     /* Version. */
@@ -273 +273 @@
     if (ppszRev)
         rc = RTStrAPrintf(ppszRev, "%s", VBOX_SVN_REV);
-#endif /* RT_OS_WINDOWS */
-    return rc;
-}
+#endif /* !RT_OS_WINDOWS */
+    return rc;
+}