儲存庫 vbox 的更動 18419

時間撮記:

2009-3-27 下午05:41:47 (16 年 以前)

作者:

vboxsync

訊息:

slirp.c: Overlooked another bogus LogRel(("adding %s to DNS suffix list\n")). Suggest simpler char conversion (disabled).

檔案:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (修改) (2 筆差異)

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

@@ -369 +369 @@
     while(addr != NULL)
     {
+#if 1
         size_t buff_size;
+#endif
         if (addr->OperStatus != IfOperStatusUp)
             goto next;
@@ -405 +407 @@
         suffix[buff_size] = '\0';
         LogRel(("NAT: adding %s to DNS suffix list\n", suffix));
-#else
-        /*Probably more correct way but not working */
-        buff_size = WideCharToMultiByte(CP_ACP, 0, addr->DnsSuffix, -1, NULL, 0, NULL, NULL);
-        suffix = RTMemAllocZ(buff_size);
-        WideCharToMultiByte(CP_ACP, 0, addr->DnsSuffix, -1, suffix, buff_size, NULL, NULL);
-#endif
-        *ppszDomain = suffix;
+        *ppszDomain = suffix; /* may leak memory */
+#else /** @todo r=bird: try this (no time to test for BETA2). Btw. what happend to suffix 'adding', the code above doesn't do what the LogRel() says... */
+        /* add the first one only. */
+        if (ppszDomain && !*ppszDomain)
+            RTUtf16ToUtf8(addr->DnsSuffix, ppszDomain);
+#endif
     next:
         addr = addr->Next;
     }
-    /*@todo add dns suffix if required */
-    LogRel(("NAT: adding dns suffix %s to the list \n", ppszDomain));
+    /** @todo add dns suffix if required */
+    if (ppszDomain && *ppszDomain)
+        LogRel(("NAT: DNS suffix %s\n", *ppszDomain));
     return 0;
 }