Changeset 49129 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 16, 2013 11:51:55 AM (12 years ago)

Author:

vboxsync

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

89981

Message:

Main/NATNetworkImpl.h: G/c drops NAT_XML_SERIALIZATION and do serialization unconditionally.

File:

• trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp (modified) (17 diffs)

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -209 +209 @@
 }
 
-#ifdef NAT_XML_SERIALIZATION
 HRESULT NATNetwork::saveSettings(settings::NATNetwork &data)
 {
@@ -261 +260 @@
     return S_OK;
 }
-#endif /* NAT_XML_SERIALIZATION */
 
 STDMETHODIMP NATNetwork::COMGETTER(EventSource)(IEventSource ** aEventSource)
@@ -291 +289 @@
 {
     CheckComArgOutPointerValid(aName);
-
-    HRESULT rc = S_OK;
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -303 +299 @@
 
     alock.release();
-
-#ifdef NAT_XML_SERIALIZATION
     AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-    rc = mVirtualBox->saveSettings();
-#endif
-    return rc;
+    HRESULT rc = mVirtualBox->saveSettings();
+    ComAssertComRCRetRC(rc);
+
+    return S_OK;
 }
 
@@ -329 +324 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
-    HRESULT rc = S_OK;
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     
@@ -339 +333 @@
     // save the global settings; for that we should hold only the VirtualBox lock
     alock.release();
-#ifdef NAT_XML_SERIALIZATION
     AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-    rc = mVirtualBox->saveSettings();
-#endif
-    return rc;
+    HRESULT rc = mVirtualBox->saveSettings();
+    ComAssertComRCRetRC(rc);
+
+    return S_OK;
 }
 
@@ -372 +366 @@
     CheckComArgOutPointerValid(aIPv4NetworkCidr);
 
-    HRESULT rc = S_OK;
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -388 +381 @@
         alock.release();
 
-#ifdef NAT_XML_SERIALIZATION
         AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-        rc = mVirtualBox->saveSettings();
-#endif
-    }
-    return rc;
+        HRESULT rc = mVirtualBox->saveSettings();
+        ComAssertComRCRetRC(rc);
+    }
+    return S_OK;
 }
 
@@ -422 +414 @@
     alock.release();
 
-    HRESULT rc = S_OK;
-#ifdef NAT_XML_SERIALIZATION
     AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-    rc = mVirtualBox->saveSettings();
-#endif
-    return rc;
+    HRESULT rc = mVirtualBox->saveSettings();
+    ComAssertComRCRetRC(rc);
+
+    return S_OK;
 }
 
@@ -447 +438 @@
     CheckComArgOutPointerValid(aIPv6Prefix);
 
-    HRESULT rc = S_OK;
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -463 +453 @@
         alock.release();
 
-#ifdef NAT_XML_SERIALIZATION
         AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-        rc = mVirtualBox->saveSettings();
-#endif
-    }
-    return rc;
+        HRESULT rc = mVirtualBox->saveSettings();
+        ComAssertComRCRetRC(rc);
+    }
+
+    return S_OK;
 }
 
@@ -497 +487 @@
     alock.release();
 
-    HRESULT rc = S_OK;
-#ifdef NAT_XML_SERIALIZATION
     AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-    rc = mVirtualBox->saveSettings();
-#endif
-    return rc;
+    HRESULT rc = mVirtualBox->saveSettings();
+    ComAssertComRCRetRC(rc);
+
+    return S_OK;
 }
 
@@ -533 +522 @@
     alock.release();
 
-    HRESULT rc = S_OK;
-#ifdef NAT_XML_SERIALIZATION
     AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
-    rc = mVirtualBox->saveSettings();
-#endif
-    return rc;
+    HRESULT rc = mVirtualBox->saveSettings();
+    ComAssertComRCRetRC(rc);
+
+    return S_OK;
 }
 
@@ -751 +739 @@
     alock.release();
 
-#ifdef NAT_XML_SERIALIZATION
     {
         AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
@@ -757 +744 @@
         ComAssertComRCRetRC(rc);
     }
-#endif
 
     mVirtualBox->onNATNetworkPortForward(mName.raw(), TRUE, aIsIpv6,
@@ -794 +780 @@
     alock.release();
 
-#ifdef NAT_XML_SERIALIZATION
     {
         AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
@@ -800 +785 @@
         ComAssertComRCRetRC(rc);
     }
-#endif
 
     mVirtualBox->onNATNetworkPortForward(mName.raw(), FALSE, aIsIpv6,