Changeset 62792 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Aug 1, 2016 7:21:13 AM (9 years ago)

Author:

vboxsync

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

109379

Message:

HostServices: warnings

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxClipboard-win.cpp (modified) (6 diffs)
• service.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp

@@ -1091 +1091 @@
 
 /*
-* Converts clipboard data from CF_HTML format to mimie clipboard format
-* Returns allocated buffer that contains html converted to text/html mime type
-* return result code
-* parameters - output buffer and size of output buffer
-* It allocates the buffer needed for storing converted fragment
-* Allocated buffer should be destroyed by RTMemFree after usage
-*/
-int ConvertCFHtmlToMime(const char *pcszSource, const uint32_t cch, char **ppszOutput, size_t *pcCh)
+ * Converts clipboard data from CF_HTML format to mimie clipboard format
+ * Returns allocated buffer that contains html converted to text/html mime type
+ * return result code
+ * parameters - output buffer and size of output buffer
+ * It allocates the buffer needed for storing converted fragment
+ * Allocated buffer should be destroyed by RTMemFree after usage
+ */
+int ConvertCFHtmlToMime(const char *pcszSource, const uint32_t cch, char **ppszOutput, size_t *pcch)
 {
     char* result = NULL;
@@ -1105 +1105 @@
     Assert(cch);
     Assert(ppszOutput);
-    Assert(pcCh);
+    Assert(pcch);
 
     size_t cStartOffset, cEndOffset;
@@ -1123 +1123 @@
     {
         size_t cSubstrlen = cEndOffset - cStartOffset;
-        result = (char*)RTMemAlloc(cSubstrlen + 1);
+        result = (char *)RTMemAlloc(cSubstrlen + 1);
         if (result)
         {
@@ -1131 +1131 @@
             {
                 *ppszOutput = result;
-                *pcCh = cSubstrlen + 1;
+                *pcch = cSubstrlen + 1;
             }
             else
@@ -1167 +1167 @@
 * @note: Everything inside of fragment can be UTF8. Windows allows it. Everything in header should be Latin1.
 */
-int ConvertMimeToCFHTML(const char *pcszSource, size_t cb, char **pcszOutput, size_t *pcCh)
-{
-    Assert(pcszOutput);
-    Assert(pcCh);
+int ConvertMimeToCFHTML(const char *pcszSource, size_t cb, char **pszOutput, size_t *pcch)
+{
+    Assert(pszOutput);
+    Assert(pcch);
     Assert(pcszSource);
     Assert(cb);
@@ -1223 +1223 @@
 #endif
 
-    *pcszOutput = pszResult;
-    *pcCh = rc+1;
+    *pszOutput = pszResult;
+    *pcch = rc + 1;
 
     return VINF_SUCCESS;

trunk/src/VBox/HostServices/SharedClipboard/service.cpp

@@ -780 +780 @@
     int rc = SSMR3PutStructEx (pSSM, pClient, sizeof(*pClient), 0 /*fFlags*/, &g_aClipboardClientDataFields[0], NULL);
     AssertRCReturn (rc, rc);
-#endif /* !UNIT_TEST */
+
+#else  /* UNIT_TEST */
+    RT_NOREF3(u32ClientID, pvClient, pSSM);
+#endif /* UNIT_TEST */
     return VINF_SUCCESS;
 }
@@ -849 +852 @@
         AssertRCReturn (rc, rc);
     }
-    else if (lenOrVer == (SSMR3HandleHostBits (pSSM) == 64 ? 72 : 48))
+    else if (lenOrVer == (SSMR3HandleHostBits (pSSM) == 64 ? 72U : 48U))
     {
         /**
@@ -899 +902 @@
     vboxClipboardSync (pClient);
 
-#endif /* !UNIT_TEST */
+#else  /* UNIT_TEST*/
+    RT_NOREF3(u32ClientID, pvClient, pSSM);
+#endif /* UNIT_TEST */
     return VINF_SUCCESS;
 }
@@ -905 +910 @@
 static DECLCALLBACK(int) extCallback (uint32_t u32Function, uint32_t u32Format, void *pvData, uint32_t cbData)
 {
+    RT_NOREF2(pvData, cbData);
     if (g_pClient != NULL)
     {