Changeset 52683 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Sep 10, 2014 4:46:58 PM (10 years ago)

Author:

vboxsync

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

96010

Message:

NAT: Fix #else /* VBOX */ comments to reflect the condition when that
#else is selected. While here, add spaces inside cramped #endif /*VBOX*/
comments.

Same object code is generated.

Location:

trunk/src/VBox/Devices/Network/slirp/libalias

Files:

• alias.c (modified) (2 diffs)
• alias_db.c (modified) (4 diffs)
• alias_ftp.c (modified) (2 diffs)
• alias_local.h (modified) (1 diff)
• alias_mod.c (modified) (1 diff)
• alias_mod.h (modified) (1 diff)
• alias_nbt.c (modified) (6 diffs)
• alias_util.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/libalias/alias.c

@@ -144 +144 @@
 #include "alias_mod.h"
 #endif
-#else /* !VBOX */
+#else  /* VBOX */
 # include <slirp.h>
 # include "alias.h"
@@ -1653 +1653 @@
 
     LibAliasAttachHandlers(m);
-#else /* !VBOX */
+#else  /* VBOX */
     NOREF(path);
 #endif /* VBOX */

trunk/src/VBox/Devices/Network/slirp/libalias/alias_db.c

@@ -173 +173 @@
 #include "alias_mod.h"
 #endif
-#else /* !VBOX */
+#else  /* VBOX */
 # include <iprt/assert.h>
 # include "alias.h"
@@ -2396 +2396 @@
     la->timeStamp = tv.tv_sec;
 #endif
-#else /* !VBOX */
+#else  /* VBOX */
     LIBALIAS_LOCK_ASSERT(la);
     la->timeStamp = la->curtime;
@@ -2721 +2721 @@
             atexit(finishoff);
 #endif
-#endif /*!VBOX*/
+#endif /* !VBOX */
         LIST_INSERT_HEAD(&instancehead, la, instancelist);
 
@@ -2733 +2733 @@
         la->lastCleanupTime = tv.tv_sec;
 #endif
-#else /* !VBOX */
+#else  /* VBOX */
         la->pData = pData;
         la->timeStamp = curtime;

trunk/src/VBox/Devices/Network/slirp/libalias/alias_ftp.c

@@ -148 +148 @@
     { EOH }
 };
-#else /* !VBOX */
+#else  /* VBOX */
 #define handlers pData->ftp_module
 #endif /* VBOX */
@@ -217 +217 @@
        "alias_ftp", mod_handler, NULL
 };
-#endif /*!VBOX*/
+#endif /* !VBOX */
 
 #ifdef  _KERNEL

trunk/src/VBox/Devices/Network/slirp/libalias/alias_local.h

@@ -60 +60 @@
 #define INADDR_NONE 0xffffffff
 #endif
-#else /* !VBOX */
+#else  /* VBOX */
 # include <slirp.h>
 #endif /* VBOX */

trunk/src/VBox/Devices/Network/slirp/libalias/alias_mod.c

@@ -55 +55 @@
 /* Protocol and userland module handlers chains. */
 LIST_HEAD(handler_chain, proto_handler) handler_chain = LIST_HEAD_INITIALIZER(foo);
-#else /* !VBOX */
+#else  /* VBOX */
 # include <slirp.h>
 # include "alias_local.h"

trunk/src/VBox/Devices/Network/slirp/libalias/alias_mod.h

@@ -44 +44 @@
 #define free(x)     free(x, M_ALIAS)
 #endif
-#else /* !VBOX */
+#else /* VBOX */
 # ifdef RT_OS_WINDOWS
 #  undef IN

trunk/src/VBox/Devices/Network/slirp/libalias/alias_nbt.c

@@ -66 +66 @@
 #include "alias_mod.h"
 #endif
-#else /*VBOX*/
+#else  /* VBOX */
 # include <iprt/ctype.h>
 # include <slirp.h>
@@ -72 +72 @@
 # include "alias_mod.h"
 # define isprint RT_C_IS_PRINT
-#endif /*VBOX*/
+#endif /* VBOX */
 
 #define NETBIOS_NS_PORT_NUMBER 137
@@ -170 +170 @@
     { EOH }
 };
-#else /* !VBOX */
+#else  /* VBOX */
 #define handlers pData->nbt_module
-#endif /*VBOX*/
+#endif /* VBOX */
 
 #ifndef VBOX
 static int
 mod_handler(module_t mod, int type, void *data)
-#else /*!VBOX*/
+#else  /* VBOX */
 static int nbt_alias_handler(PNATState pData, int type);
 
@@ -193 +193 @@
 static int
 nbt_alias_handler(PNATState pData, int type)
-#endif /*VBOX*/
+#endif /* VBOX */
 {
     int error;
@@ -220 +220 @@
 
     handlers[3].pri = EOH;
-#endif /*VBOX*/
+#endif /* VBOX */
 
     switch (type) {
@@ -254 +254 @@
        "alias_nbt", mod_handler, NULL
 };
-#endif /*!VBOX*/
+#endif /* !VBOX */
 
 #ifdef  _KERNEL

trunk/src/VBox/Devices/Network/slirp/libalias/alias_util.c

@@ -65 +65 @@
 #include "alias_local.h"
 #endif
-#else /* !VBOX */
+#else  /* VBOX */
 # include <slirp.h>
 # include "alias.h"