Changeset 39859 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jan 24, 2012 4:50:08 PM (13 years ago)

Author:

vboxsync

Message:

CFGMR3CopyTree: Fix and docs.

File:

• trunk/src/VBox/VMM/VMMR3/CFGM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/CFGM.cpp

@@ -1413 +1413 @@
 
 
+/**
+ * Copies all values and keys from one tree onto another.
+ *
+ * The flags control what happens to keys and values with the same name
+ * existing in both source and destination.
+ *
+ * @returns VBox status code.
+ * @param   pDstTree            The destination tree.
+ * @param   pSrcTree            The source tree.
+ * @param   fFlags              Copy flags, see CFGM_COPY_FLAGS_XXX.
+ */
 VMMR3DECL(int) CFGMR3CopyTree(PCFGMNODE pDstTree, PCFGMNODE pSrcTree, uint32_t fFlags)
 {
@@ -1420 +1431 @@
     AssertPtrReturn(pSrcTree, VERR_INVALID_POINTER);
     AssertPtrReturn(pDstTree, VERR_INVALID_POINTER);
-    AssertReturn(pDstTree != pDstTree, VERR_INVALID_PARAMETER);
+    AssertReturn(pDstTree != pSrcTree, VERR_INVALID_PARAMETER);
     AssertReturn(!(fFlags & ~(CFGM_COPY_FLAGS_VALUE_DISP_MASK | CFGM_COPY_FLAGS_KEY_DISP_MASK)), VERR_INVALID_PARAMETER);
     AssertReturn(   (fFlags & CFGM_COPY_FLAGS_VALUE_DISP_MASK) != CFGM_COPY_FLAGS_RESERVED_VALUE_DISP_0