Changeset 60154 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 23, 2016 11:29:21 AM (9 years ago)

Author:

vboxsync

Message:

Main,USBLib: Promoted usbPurgeEncoding to USBLibPurgeEncoding as it will be needed both in ring-0 and ring-3 and by all OSes.

File:

• trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -73 +73 @@
     VECTOR_PTR(char *) mvecpszInterfaces;
 } USBDeviceInfo;
-
-
-
-/**
- * Purge string of non-UTF-8 encodings and control characters.
- *
- * @returns String length (excluding terminator).
- * @param   psz                 The string to purge.
- */
-static size_t usbPurgeEncoding(char *psz)
-{
-    /* Beat it into valid UTF-8 encoding. */
-    RTStrPurgeEncoding(psz);
-
-    /* Look for control characters. */
-    size_t offSrc;
-    for (offSrc = 0; ; offSrc++)
-    {
-        char ch = psz[offSrc];
-        if (RT_UNLIKELY(RT_C_IS_CNTRL(ch)))
-        {
-            /* Found a control character! Replace tab by space and remove all others. */
-            size_t offDst = offSrc;
-            for (;; offSrc++)
-            {
-                ch = psz[offSrc];
-                if (RT_C_IS_CNTRL(ch))
-                {
-                    if (ch == '\t')
-                        ch = ' ';
-                    else
-                        continue;
-                }
-                psz[offDst++] = ch;
-                if (ch == '\0')
-                    break;
-            }
-            return offDst - 1;
-        }
-        if (ch == '\0')
-            break;
-    }
-    return offSrc - 1;
-}
 
 
@@ -442 +398 @@
     if (psz)
     {
-        usbPurgeEncoding(psz);
+        USBLibPurgeEncoding(psz);
         *ppsz = psz;
         return VINF_SUCCESS;
@@ -1331 +1287 @@
     if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
     {
-        usbPurgeEncoding(szBuf);
+        USBLibPurgeEncoding(szBuf);
         pDev->pszProduct = RTStrDup(szBuf);
     }
@@ -1338 +1294 @@
     if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
     {
-        usbPurgeEncoding(szBuf);
+        USBLibPurgeEncoding(szBuf);
         pDev->pszSerialNumber = RTStrDup(szBuf);
         pDev->u64SerialHash = USBLibHashSerial(szBuf);
@@ -1346 +1302 @@
     if (cchRead > 0 && (size_t) cchRead < sizeof(szBuf))
     {
-        usbPurgeEncoding(szBuf);
+        USBLibPurgeEncoding(szBuf);
         pDev->pszManufacturer = RTStrDup(szBuf);
     }