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

Timestamp:

Aug 1, 2016 1:02:02 PM (9 years ago)

Author:

vboxsync

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

109403

Message:

GuestHost/DragAndDrop: warnings

Location:

trunk/src/VBox/GuestHost/DragAndDrop

Files:

• DnDDroppedFiles.cpp (modified) (4 diffs)
• DnDPath.cpp (modified) (3 diffs)
• DnDURIList.cpp (modified) (3 diffs)
• DnDURIObject.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp

@@ -111 +111 @@
     {
         char pszDropDir[RTPATH_MAX];
-        size_t cchDropDir = RTStrPrintf(pszDropDir, sizeof(pszDropDir), "%s", pszPath);
+        RTStrPrintf(pszDropDir, sizeof(pszDropDir), "%s", pszPath);
 
         /** @todo On Windows we also could use the registry to override
@@ -229 +229 @@
         if (RT_SUCCESS(rc2))
             this->m_lstFiles.removeAt(i);
-
-        if (RT_SUCCESS(rc))
+        else if (RT_SUCCESS(rc))
            rc = rc2;
         /* Keep going. */
@@ -240 +239 @@
         if (RT_SUCCESS(rc2))
             this->m_lstDirs.removeAt(i);
-
-        if (RT_SUCCESS(rc))
+        else if (RT_SUCCESS(rc))
             rc = rc2;
         /* Keep going. */
@@ -258 +256 @@
             rc2 = RTDirRemove(this->m_strPathAbs.c_str());
         }
-    }
-
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+

trunk/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * DnD: Path handling.
+ * DnD - Path handling.
  */
 
@@ -38 +38 @@
     int rc = VINF_SUCCESS;
 #ifdef RT_OS_WINDOWS
+    RT_NOREF1(cbPath);
     /* Filter out characters not allowed on Windows platforms, put in by
        RTTimeSpecToString(). */
     /** @todo Use something like RTPathSanitize() when available. Later. */
-    RTUNICP aCpSet[] =
-        { ' ', ' ', '(', ')', '-', '.', '0', '9', 'A', 'Z', 'a', 'z', '_', '_',
-          0xa0, 0xd7af, '\0' };
-    ssize_t cReplaced = RTStrPurgeComplementSet(pszPath, aCpSet, '_' /* Replacement */);
+    static const RTUNICP s_aCpSet[] =
+    {
+        ' ', ' ', '(', ')', '-', '.', '0', '9', 'A', 'Z', 'a', 'z', '_', '_',
+        0xa0, 0xd7af, '\0'
+    };
+    ssize_t cReplaced = RTStrPurgeComplementSet(pszPath, s_aCpSet, '_' /* Replacement */);
     if (cReplaced < 0)
         rc = VERR_INVALID_UTF8_ENCODING;
+#else
+    RT_NOREF2(pszPath, cbPath);
 #endif
     return rc;
@@ -54 +59 @@
 {
     /** @todo */
+    RT_NOREF2(pszPath, cbPath);
     return VINF_SUCCESS;
 }

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -129 +129 @@
             rc = addEntry(pcszSrcPath, &pcszDstPath[cchDstBase], fFlags);
 
-            PRTDIR hDir;
             if (RT_SUCCESS(rc))
+            {
+                PRTDIR hDir;
                 rc = RTDirOpen(&hDir, pcszSrcPath);
-            if (RT_SUCCESS(rc))
-            {
-                do
+                if (RT_SUCCESS(rc))
                 {
-                    RTDIRENTRY DirEntry;
-                    rc = RTDirRead(hDir, &DirEntry, NULL);
-                    if (RT_FAILURE(rc))
+                    do
                     {
-                        if (rc == VERR_NO_MORE_FILES)
-                            rc = VINF_SUCCESS;
-                        break;
-                    }
-
-                    switch (DirEntry.enmType)
-                    {
-                        case RTDIRENTRYTYPE_DIRECTORY:
+                        RTDIRENTRY DirEntry;
+                        rc = RTDirRead(hDir, &DirEntry, NULL);
+                        if (RT_FAILURE(rc))
                         {
-                            /* Skip "." and ".." entries. */
-                            if (   RTStrCmp(DirEntry.szName, ".")  == 0
-                                || RTStrCmp(DirEntry.szName, "..") == 0)
-                                break;
-
-                            char *pszSrc = RTPathJoinA(pcszSrcPath, DirEntry.szName);
-                            if (pszSrc)
-                            {
-                                char *pszDst = RTPathJoinA(pcszDstPath, DirEntry.szName);
-                                if (pszDst)
-                                {
-                                    rc = appendPathRecursive(pszSrc, pszDst, pcszDstBase, cchDstBase, fFlags);
-                                    RTStrFree(pszDst);
-                                }
-                                else
-                                    rc = VERR_NO_MEMORY;
-
-                                RTStrFree(pszSrc);
-                            }
-                            else
-                                rc = VERR_NO_MEMORY;
+                            if (rc == VERR_NO_MORE_FILES)
+                                rc = VINF_SUCCESS;
                             break;
                         }
 
-                        case RTDIRENTRYTYPE_FILE:
+                        switch (DirEntry.enmType)
                         {
-                            char *pszSrc = RTPathJoinA(pcszSrcPath, DirEntry.szName);
-                            if (pszSrc)
+                            case RTDIRENTRYTYPE_DIRECTORY:
                             {
-                                char *pszDst = RTPathJoinA(pcszDstPath, DirEntry.szName);
-                                if (pszDst)
-                                {
-                                    rc = addEntry(pszSrc, &pszDst[cchDstBase], fFlags);
-                                    RTStrFree(pszDst);
-                                }
-                                else
-                                    rc = VERR_NO_MEMORY;
-                                RTStrFree(pszSrc);
-                            }
-                            else
-                                rc = VERR_NO_MEMORY;
-                            break;
-                        }
-                        case RTDIRENTRYTYPE_SYMLINK:
-                        {
-                            if (fFlags & DNDURILIST_FLAGS_RESOLVE_SYMLINKS)
-                            {
-                                char *pszSrc = RTPathRealDup(pcszDstBase);
+                                /* Skip "." and ".." entries. */
+                                if (   RTStrCmp(DirEntry.szName, ".")  == 0
+                                    || RTStrCmp(DirEntry.szName, "..") == 0)
+                                    break;
+
+                                char *pszSrc = RTPathJoinA(pcszSrcPath, DirEntry.szName);
                                 if (pszSrc)
                                 {
-                                    rc = RTPathQueryInfo(pszSrc, &objInfo, RTFSOBJATTRADD_NOTHING);
-                                    if (RT_SUCCESS(rc))
+                                    char *pszDst = RTPathJoinA(pcszDstPath, DirEntry.szName);
+                                    if (pszDst)
                                     {
-                                        if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
-                                        {
-                                            LogFlowFunc(("Directory entry is symlink to directory\n"));
-                                            rc = appendPathRecursive(pszSrc, pcszDstPath, pcszDstBase, cchDstBase, fFlags);
-                                        }
-                                        else if (RTFS_IS_FILE(objInfo.Attr.fMode))
-                                        {
-                                            LogFlowFunc(("Directory entry is symlink to file\n"));
-                                            rc = addEntry(pszSrc, &pcszDstPath[cchDstBase], fFlags);
-                                        }
-                                        else
-                                            rc = VERR_NOT_SUPPORTED;
+                                        rc = appendPathRecursive(pszSrc, pszDst, pcszDstBase, cchDstBase, fFlags);
+                                        RTStrFree(pszDst);
                                     }
+                                    else
+                                        rc = VERR_NO_MEMORY;
 
                                     RTStrFree(pszSrc);
@@ -220 +171 @@
                                 else
                                     rc = VERR_NO_MEMORY;
+                                break;
                             }
-                            break;
+
+                            case RTDIRENTRYTYPE_FILE:
+                            {
+                                char *pszSrc = RTPathJoinA(pcszSrcPath, DirEntry.szName);
+                                if (pszSrc)
+                                {
+                                    char *pszDst = RTPathJoinA(pcszDstPath, DirEntry.szName);
+                                    if (pszDst)
+                                    {
+                                        rc = addEntry(pszSrc, &pszDst[cchDstBase], fFlags);
+                                        RTStrFree(pszDst);
+                                    }
+                                    else
+                                        rc = VERR_NO_MEMORY;
+                                    RTStrFree(pszSrc);
+                                }
+                                else
+                                    rc = VERR_NO_MEMORY;
+                                break;
+                            }
+                            case RTDIRENTRYTYPE_SYMLINK:
+                            {
+                                if (fFlags & DNDURILIST_FLAGS_RESOLVE_SYMLINKS)
+                                {
+                                    char *pszSrc = RTPathRealDup(pcszDstBase);
+                                    if (pszSrc)
+                                    {
+                                        rc = RTPathQueryInfo(pszSrc, &objInfo, RTFSOBJATTRADD_NOTHING);
+                                        if (RT_SUCCESS(rc))
+                                        {
+                                            if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
+                                            {
+                                                LogFlowFunc(("Directory entry is symlink to directory\n"));
+                                                rc = appendPathRecursive(pszSrc, pcszDstPath, pcszDstBase, cchDstBase, fFlags);
+                                            }
+                                            else if (RTFS_IS_FILE(objInfo.Attr.fMode))
+                                            {
+                                                LogFlowFunc(("Directory entry is symlink to file\n"));
+                                                rc = addEntry(pszSrc, &pcszDstPath[cchDstBase], fFlags);
+                                            }
+                                            else
+                                                rc = VERR_NOT_SUPPORTED;
+                                        }
+
+                                        RTStrFree(pszSrc);
+                                    }
+                                    else
+                                        rc = VERR_NO_MEMORY;
+                                }
+                                break;
+                            }
+
+                            default:
+                                break;
                         }
 
-                        default:
-                            break;
-                    }
-
-                } while (RT_SUCCESS(rc));
-
-                RTDirClose(hDir);
+                    } while (RT_SUCCESS(rc));
+
+                    RTDirClose(hDir);
+                }
             }
         }
@@ -446 +448 @@
 int DnDURIList::RootFromURIData(const void *pvData, size_t cbData, uint32_t fFlags)
 {
+    Assert(fFlags == 0); RT_NOREF1(fFlags);
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
     AssertReturn(cbData, VERR_INVALID_PARAMETER);

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp

@@ -134 +134 @@
                          uint64_t fOpen /* = 0 */, uint32_t fMode /* = 0 */, uint32_t fFlags /* = 0 */)
 {
+    Assert(fFlags == 0); RT_NOREF1(fFlags);
     int rc = VINF_SUCCESS;