Changeset 48107 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 27, 2013 10:15:13 PM (12 years ago)

Author:

vboxsync

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

88483

Message:

NATNetwork windows build fix. Fixed memory leak in recalculateIpv4AddressAssignments due to confusing string handling and simplified the code there a little (~20 lines shorter). Fixed indentation and some other nits.

Location:

trunk/src/VBox/Main/include

Files:

• NATNetworkImpl.h (modified) (3 diffs)
• NetworkServiceRunner.h (modified) (5 diffs)

trunk/src/VBox/Main/include/NATNetworkImpl.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
- *
- * VirtualBox COM class implementation
+ * INATNetwork implementation header, lives in VBoxSVC.
  */
 
@@ -129 +127 @@
 
 private:
-    int RecalculateIpv4AddressAssignments();
+    int recalculateIpv4AddressAssignments();
     int findFirstAvailableOffset(uint32_t *);
 
@@ -145 +143 @@
 };
 
-#endif // ____H_H_NATNETWORKIMPL
+#endif // !____H_H_NATNETWORKIMPL

trunk/src/VBox/Main/include/NetworkServiceRunner.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox Main - interface for VBox DHCP server
+ * VirtualBox Main - interface for VBox DHCP server.
  */
 
@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #include <iprt/err.h>
 #include <iprt/types.h>
@@ -32 +33 @@
     NETCFG_VERBOSE,
     NETCFG_NOTOPT_MAXVAL
-}NETCFG;
+} NETCFG;
 
 #define TRUNKTYPE_WHATEVER "whatever"
@@ -42 +43 @@
 {
 public:
-    NetworkServiceRunner(const char *aProcName):
-      mProcName(aProcName),
-      mProcess(NIL_RTPROCESS)
+    NetworkServiceRunner(const char *aProcName)
+        : mProcName(aProcName)
+        , mProcess(NIL_RTPROCESS)
     {
-        memset(mOptionEnabled, 0, sizeof(mOptionEnabled));
+        RT_ZERO(mOptionEnabled);
     };
-    ~NetworkServiceRunner() { stop(); /* don't leave abandoned servers */}
+    ~NetworkServiceRunner()
+    {
+        stop(); /* don't leave abandoned servers */
+    }
 
     int setOption(NETCFG opt, const char *val, bool enabled)
@@ -78 +82 @@
     RTPROCESS mProcess;
 };
+