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

Timestamp:

Aug 7, 2016 3:16:53 AM (9 years ago)

Author:

vboxsync

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

109737

Message:

warnings

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp (modified) (4 diffs)

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

@@ -85 +85 @@
         Log(("DUMP: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT:\n"));
         if (pv && cb)
-        {
             Log(("%ls\n", pv));
-        }
         else
-        {
             Log(("%p %d\n", pv, cb));
-        }
     }
     else if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
-    {
         dprintf(("DUMP: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
-    }
     else if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_HTML)
     {
@@ -105 +99 @@
 
             //size_t cb = RTStrNLen(pv, );
-            char* buf = (char*)RTMemAlloc(cb + 1);
+            char *buf = (char *)RTMemAlloc(cb + 1);
             RT_BZERO(buf, cb);
             RTStrCopy(buf, cb, (const char*)pv);
-            for (int i = 0; i < cb; ++i)
-            {
-                if (buf[i] == '\n' || buf[i] == '\r')
-                    buf[i] = ' ';
+            for (size_t off = 0; off < cb; ++off)
+            {
+                if (buf[off] == '\n' || buf[off] == '\r')
+                    buf[off] = ' ';
             }
 
@@ -118 +112 @@
         }
         else
-        {
             Log(("%p %d\n", pv, cb));
-        }
     }
     else
-    {
         dprintf(("DUMP: invalid format %02X\n", u32Format));
-    }
-}
-#else
-#define vboxClipboardDump(__pv, __cb, __format) do { NOREF(__pv); NOREF(__cb); NOREF(__format); } while (0)
-#endif /* LOG_ENABLED */
+}
+#else  /* !LOG_ENABLED */
+# define vboxClipboardDump(__pv, __cb, __format) do { NOREF(__pv); NOREF(__cb); NOREF(__format); } while (0)
+#endif /* !LOG_ENABLED */
 
 
@@ -857 +847 @@
             if (RT_SUCCESS(rc))
             {
-                for (int i = 0; i < cb; ++i)
-                {
+                for (size_t i = 0; i < cb; ++i)
                     if (buf[i] == '\n' || buf[i] == '\r')
                         buf[i] = ' ';
-                }
             }
             else
-            {
                 Log(("Error in copying string.\n"));
-            }
             Log(("Removed \\r\\n: %s\n", buf));
             RTMemFree(buf);