Changeset 102818 in vbox for trunk

Timestamp:

Jan 10, 2024 1:56:27 PM (13 months ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Use ShClTransferHttpConvertToStringList() -- removed duplicate code. bugref:9437

Location:

trunk/src/VBox

Files:

• Additions/x11/VBoxClient/clipboard-x11.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp

@@ -337 +337 @@
                         if (RT_SUCCESS(rc))
                         {
-                            char *pszURL = NULL;
-
-                            uint64_t const cRoots = ShClTransferRootsCount(pTransfer);
-                            for (uint32_t i = 0; i < cRoots; i++)
-                            {
-                                char *pszEntry = ShClTransferHttpServerGetUrlA(pSrv, ShClTransferGetID(pTransfer), i /* Entry index */);
-                                AssertPtrBreakStmt(pszEntry, rc = VERR_NO_MEMORY);
-
-                                if (i > 0)
-                                {
-                                    rc = RTStrAAppend(&pszURL, "\n"); /* Separate entries with a newline. */
-                                    AssertRCBreak(rc);
-                                }
-
-                                rc = RTStrAAppend(&pszURL, pszEntry);
-                                AssertRCBreak(rc);
-
-                                RTStrFree(pszEntry);
-                            }
-
+                            char  *pszData;
+                            size_t cbData;
+                            rc = ShClTransferHttpConvertToStringList(pSrv, pTransfer, &pszData, &cbData);
                             if (RT_SUCCESS(rc))
                             {
-                                *ppv = pszURL;
-                                *pcb = strlen(pszURL) + 1 /* Include terminator */;
-
-                                LogFlowFunc(("URL is '%s'\n", pszURL));
-
-                                /* ppv has ownership of pszURL. */
+                                *ppv = pszData;
+                                *pcb = cbData;
+                                /* ppv has ownership of pszData now. */
                             }
                         }

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -620 +620 @@
                     if (RT_SUCCESS(rc))
                     {
-                        char *pszURL = NULL;
-
-                        uint64_t const cRoots = ShClTransferRootsCount(pTransfer);
-                        for (uint32_t i = 0; i < cRoots; i++)
-                        {
-                            char *pszEntry = ShClTransferHttpServerGetUrlA(pHttpSrv, ShClTransferGetID(pTransfer), i /* Entry index */);
-                            AssertPtrBreakStmt(pszEntry, rc = VERR_NO_MEMORY);
-
-                            if (i > 0)
-                            {
-                                rc = RTStrAAppend(&pszURL, "\n"); /* Separate entries with a newline. */
-                                AssertRCBreak(rc);
-                            }
-
-                            rc = RTStrAAppend(&pszURL, pszEntry);
-                            AssertRCBreak(rc);
-
-                            RTStrFree(pszEntry);
-                        }
-
+                        char  *pszData;
+                        size_t cbData;
+                        rc = ShClTransferHttpConvertToStringList(pHttpSrv, pTransfer, &pszData, &cbData);
                         if (RT_SUCCESS(rc))
                         {
-                            *ppv = pszURL;
-                            *pcb = strlen(pszURL) + 1 /* Include terminator */;
-
-                            LogFlowFunc(("URL is '%s'\n", pszURL));
-
-                            /* ppv has ownership of pszURL. */
+                            *ppv = pszData;
+                            *pcb = cbData;
+                            /* ppv has ownership of pszData now. */
                         }
                     }