Changeset 86247 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Sep 23, 2020 4:44:40 PM (5 years ago)

Author:

vboxsync

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

140518

Message:

SharedClipboard/win: Build fix (strict/win) and some cleanup.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -974 +974 @@
 
 #ifdef LOG_ENABLED
+
 int ShClDbgDumpHtml(const char *pcszSrc, size_t cbSrc)
 {
-    size_t cchIgnored = 0;
-    int rc = RTStrNLenEx(pcszSrc, cbSrc, &cchIgnored);
-    if (RT_SUCCESS(rc))
-    {
-        char *pszBuf = (char *)RTMemAllocZ(cbSrc + 1);
-        if (pszBuf)
-        {
-            rc = RTStrCopy(pszBuf, cbSrc + 1, (const char *)pcszSrc);
-            if (RT_SUCCESS(rc))
+    int rc = VINF_SUCCESS;
+    char *pszBuf = (char *)RTMemTmpAllocZ(cbSrc + 1);
+    if (pszBuf)
+    {
+        memcpy(pszBuf, pcszSrc, cbSrc);
+        pszBuf[cbSrc] = '\0';
+        for (size_t off = 0; off < cbSrc; ++off)
+            if (pszBuf[off] == '\n' || pszBuf[off] == '\r')
+                pszBuf[off] = ' ';
+        LogFunc(("Removed \\r\\n: %s\n", pszBuf));
+        RTMemTmpFree(pszBuf);
+    }
+    else
+        rc = VERR_NO_MEMORY;
+    return rc;
+}
+
+void ShClDbgDumpData(const void *pv, size_t cb, SHCLFORMAT uFormat)
+{
+    if (LogIsEnabled())
+    {
+        if (uFormat & VBOX_SHCL_FMT_UNICODETEXT)
+        {
+            LogFunc(("VBOX_SHCL_FMT_UNICODETEXT:\n"));
+            if (pv && cb)
+                LogFunc(("%ls\n", pv));
+            else
+                LogFunc(("%p %zu\n", pv, cb));
+        }
+        else if (uFormat & VBOX_SHCL_FMT_BITMAP)
+            LogFunc(("VBOX_SHCL_FMT_BITMAP\n"));
+        else if (uFormat & VBOX_SHCL_FMT_HTML)
+        {
+            LogFunc(("VBOX_SHCL_FMT_HTML:\n"));
+            if (pv && cb)
             {
-                for (size_t i = 0; i < cbSrc; ++i)
-                    if (pszBuf[i] == '\n' || pszBuf[i] == '\r')
-                        pszBuf[i] = ' ';
+                LogFunc(("%s\n", pv));
+                ShClDbgDumpHtml((const char *)pv, cb);
             }
             else
-                LogFunc(("Error in copying string\n"));
-            LogFunc(("Removed \\r\\n: %s\n", pszBuf));
-            RTMemFree(pszBuf);
+                LogFunc(("%p %zu\n", pv, cb));
         }
         else
-            rc = VERR_NO_MEMORY;
-    }
-
-    return rc;
-}
-
-void ShClDbgDumpData(const void *pv, size_t cb, SHCLFORMAT uFormat)
-{
-    if (uFormat & VBOX_SHCL_FMT_UNICODETEXT)
-    {
-        LogFunc(("VBOX_SHCL_FMT_UNICODETEXT:\n"));
-        if (pv && cb)
-            LogFunc(("%ls\n", pv));
-        else
-            LogFunc(("%p %zu\n", pv, cb));
-    }
-    else if (uFormat & VBOX_SHCL_FMT_BITMAP)
-        LogFunc(("VBOX_SHCL_FMT_BITMAP\n"));
-    else if (uFormat & VBOX_SHCL_FMT_HTML)
-    {
-        LogFunc(("VBOX_SHCL_FMT_HTML:\n"));
-        if (pv && cb)
-        {
-            LogFunc(("%s\n", pv));
-
-            //size_t cb = RTStrNLen(pv, );
-            char *pszBuf = (char *)RTMemAllocZ(cb + 1);
-            RTStrCopy(pszBuf, cb + 1, (const char *)pv);
-            for (size_t off = 0; off < cb; ++off)
-            {
-                if (pszBuf[off] == '\n' || pszBuf[off] == '\r')
-                    pszBuf[off] = ' ';
-            }
-
-            LogFunc(("%s\n", pszBuf));
-            RTMemFree(pszBuf);
-        }
-        else
-            LogFunc(("%p %zu\n", pv, cb));
-    }
-    else
-        LogFunc(("Invalid format %02X\n", uFormat));
-}
+            LogFunc(("Invalid format %02X\n", uFormat));
+    }
+}
+
 #endif /* LOG_ENABLED */