vbox的更動 61881 路徑 trunk/src/VBox/ValidationKit

時間撮記:

2016-6-24 下午02:25:08 (8 年 以前)

作者:

vboxsync

訊息:

ValidationKit/UsbTestService: Move to the new RTJson* API for parsing the configuration file (for later, the configuration file is unused at the moment)

位置:

trunk/src/VBox/ValidationKit/utils/usb

檔案:

• Makefile.kmk (修改) (1 筆差異)
• UsbTestService.cpp (修改) (4 筆差異)
• UsbTestServiceCfg.cpp (刪除)
• UsbTestServiceCfg.h (刪除)

trunk/src/VBox/ValidationKit/utils/usb/Makefile.kmk

@@ -44 +44 @@
 UsbTestService_SOURCES = \
         UsbTestService.cpp \
-        UsbTestServiceCfg.cpp \
         UsbTestServiceGadgetCfg.cpp \
         UsbTestServiceGadgetClassTest.cpp \

trunk/src/VBox/ValidationKit/utils/usb/UsbTestService.cpp

@@ -42 +42 @@
 #include <iprt/handle.h>
 #include <iprt/initterm.h>
+#include <iprt/json.h>
 #include <iprt/list.h>
 #include <iprt/log.h>
@@ -55 +56 @@
 #include <iprt/thread.h>
 
-#include "UsbTestServiceCfg.h"
 #include "UsbTestServiceInternal.h"
 #include "UsbTestServiceGadget.h"
@@ -152 +152 @@
 static bool volatile        g_fTerminate = false;
 /** Configuration AST. */
-static PCFGAST              g_pCfgAst = NULL;
+static RTJSONVAL            g_hCfgJson = NIL_RTJSONVAL;
 /** Pipe for communicating with the serving thread about new clients. - read end */
 static RTPIPE               g_hPipeR;
@@ -1248 +1248 @@
     RTListInit(&g_LstClientsNew);
 
-    rc = utsParseConfig(g_szCfgPath, &g_pCfgAst, &pErrInfo);
+    rc = RTJsonParseFromFile(&g_hCfgJson, g_szCfgPath, pErrInfo);
     if (RT_SUCCESS(rc))
     {