Changeset 59686 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Feb 15, 2016 5:01:24 PM (9 years ago)

Author:

vboxsync

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

105543

Message:

VUSBSniffer: Add flag to avoid overwriting exitisting captures, compiler warnings

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBSniffer.cpp (modified) (1 diff)
• VUSBSniffer.h (modified) (2 diffs)
• VUSBSnifferUsbMon.cpp (modified) (1 diff)

trunk/src/VBox/Devices/USB/VUSBSniffer.cpp

@@ -159 +159 @@
         if (RT_SUCCESS(rc))
         {
-            rc = RTFileOpen(&pThis->hFile, pszCaptureFilename, RTFILE_O_DENY_NONE | RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_READ);
+            uint32_t fFileFlags = RTFILE_O_DENY_NONE | RTFILE_O_WRITE | RTFILE_O_READ;
+            if (fFlags & VUSBSNIFFER_F_NO_REPLACE)
+                fFileFlags |= RTFILE_O_CREATE;
+            else
+                fFileFlags |= RTFILE_O_CREATE_REPLACE;
+
+            rc = RTFileOpen(&pThis->hFile, pszCaptureFilename, fFileFlags);
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/Devices/USB/VUSBSniffer.h

@@ -52 +52 @@
 } VUSBSNIFFEREVENT;
 
+/** VUSB Sniffer creation flags.
+ * @{ */
+/** Default flags. */
+#define VUSBSNIFFER_F_DEFAULT    0
+/** Don't overwrite any existing capture file. */
+#define VUSBSNIFFER_F_NO_REPLACE RT_BIT_32(0)
+/** @} */
+
 /**
  * Create a new VUSB sniffer instance dumping to the given capture file.
@@ -57 +65 @@
  * @returns VBox status code.
  * @param   phSniffer             Where to store the handle to the sniffer instance on success.
- * @param   fFlags                Flags, reserved, must be 0.
+ * @param   fFlags                Flags, combination of VUSBSNIFFER_F_*
  * @param   pszCaptureFilename    The filename to use for capturing the sniffed data.
  * @param   pszFmt                The format of the dump, NULL to select one based on the filename

trunk/src/VBox/Devices/USB/VUSBSnifferUsbMon.cpp

@@ -88 +88 @@
 {
     char aszLineBuf[512];
-    char chEvtType;
-    char chDir;
-    char chEptType;
+    char chEvtType = 'X';
+    char chDir = 'X';
+    char chEptType = 'X';
 
     switch (enmEvent)