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

Timestamp:

Jul 30, 2008 11:53:26 AM (16 years ago)

Author:

vboxsync

Message:

HostServices/GuestProperties and Additions/common: reactivated autores

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxControl/VBoxControl.cpp (modified) (1 diff)
• VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -30 +30 @@
 #include <iprt/path.h>
 #include <iprt/initterm.h>
-#include <iprt/autores>
+#include <iprt/autores.h>
 #include <VBox/log.h>
 #include <VBox/VBoxGuest.h>

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

@@ -28 +28 @@
 #include <iprt/mem.h>
 #include <iprt/assert.h>
-#if 0 /** @todo this isn't work. As noted elsewhere, avoid complicated templates. */
-# include <iprt/autores>
-#endif
+#include <iprt/autores.h>
 #include <iprt/stdarg.h>
 #include <VBox/log.h>
@@ -534 +532 @@
                                     char **ppszFlags)
 {
-#if 1 /* the RTMemAutoPtr doesn't compile */
-    return VERR_NOT_IMPLEMENTED;
-#else
     int rc = VINF_SUCCESS;
-    RTMemAutoPtr<VBGLR3GUESTPROPENUM, VbglR3GuestPropEnumFree> pHandle;
-    pHandle = reinterpret_cast<PVBGLR3GUESTPROPENUM>(
-                                      RTMemAllocZ(sizeof(VBGLR3GUESTPROPENUM))
-                                                    );
-    if (NULL == pHandle.get())
+    RTMemAutoPtr<VBGLR3GUESTPROPENUM, VbglR3GuestPropEnumFree> apHandle;
+    apHandle = reinterpret_cast<PVBGLR3GUESTPROPENUM>(
+                                       RTMemAllocZ(sizeof(VBGLR3GUESTPROPENUM))
+                                                     );
+    if (NULL == apHandle.get())
         rc = VERR_NO_MEMORY;
 
@@ -586 +581 @@
     {
         /* Transfer ownership of the buffer to the handle structure. */
-        pHandle->pchBuf = pchBuf.release();
-        pHandle->cchBuf = cchBuf;
-    }
-    if (RT_SUCCESS(rc))
-        rc = VbglR3GuestPropEnumNext(pHandle.get(), ppszName, ppszValue,
+        apHandle->pchBuf = pchBuf.release();
+        apHandle->cchBuf = cchBuf;
+    }
+    if (RT_SUCCESS(rc))
+        rc = VbglR3GuestPropEnumNext(apHandle.get(), ppszName, ppszValue,
                                      pu64Timestamp, ppszFlags);
     if (RT_SUCCESS(rc) && (NULL == ppszName))
@@ -597 +592 @@
     /* And transfer ownership of the handle to the caller. */
     if (RT_SUCCESS(rc))
-        *ppHandle = pHandle.release();
-    return rc;
-#endif
+        *ppHandle = apHandle.release();
+    return rc;
 }