Changeset 104490 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

May 2, 2024 4:43:26 PM (11 months ago)

Author:

vboxsync

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

163012

Message:

src/libs/xpcom/io: Some smaller cleanups, fix a possible double expansion of a statement with side effects passed to a macro, bugref:3409

Location:

trunk/src/libs/xpcom18a4/xpcom/io

Files:

• nsDirectoryService.cpp (modified) (4 diffs)
• nsLocalFileUnix.cpp (modified) (3 diffs)
• nsNativeCharsetUtils.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/io/nsDirectoryService.cpp

@@ -92 +92 @@
         return NS_ERROR_FAILURE;
 
-    nsresult rv;
-
     nsCOMPtr<nsIProperties> dirService;
-    rv = nsDirectoryService::Create(nsnull,
-                                    NS_GET_IID(nsIProperties),
-                                    getter_AddRefs(dirService));  // needs to be around for life of product
+    nsDirectoryService::Create(nsnull,
+                               NS_GET_IID(nsIProperties),
+                               getter_AddRefs(dirService));  // needs to be around for life of product
 
     if (dirService)
@@ -121 +119 @@
 #if defined(XP_MACOSX)
 # ifdef MOZ_DEFAULT_VBOX_XPCOM_HOME
-    rv = localFile->InitWithNativePath(nsDependentCString(MOZ_DEFAULT_VBOX_XPCOM_HOME));
+    nsresult rv = localFile->InitWithNativePath(nsDependentCString(MOZ_DEFAULT_VBOX_XPCOM_HOME));
     if (NS_SUCCEEDED(rv))
         *aFile = localFile;
@@ -141 +139 @@
                 if (CFURLGetFileSystemRepresentation(parentURL, PR_TRUE, (UInt8 *)buffer, sizeof(buffer)))
                 {
-                    rv = localFile->InitWithNativePath(nsDependentCString(buffer));
+                    nsresult rv = localFile->InitWithNativePath(nsDependentCString(buffer));
                     if (NS_SUCCEEDED(rv))
                         *aFile = localFile;
@@ -623 +621 @@
         rv = GetSpecialSystemDirectory(OS_TemporaryDirectory, getter_AddRefs(localFile));
     }
-    else if (inAtom == nsDirectoryService::sOS_CurrentProcessDirectory)
-    {
-        rv = GetSpecialSystemDirectory(OS_CurrentProcessDirectory, getter_AddRefs(localFile));
-    }
     else if (inAtom == nsDirectoryService::sOS_CurrentWorkingDirectory)
     {

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.cpp

@@ -869 +869 @@
 
     if (!recursive && isSymLink)
-        return NSRESULT_FOR_IPRT(RTErrConvertFromErrno(unlink(mPath.get())));
+    {
+        int vrc = RTErrConvertFromErrno(unlink(mPath.get()));
+        return NSRESULT_FOR_IPRT(vrc);
+    }
     
     isDir = S_ISDIR(mCachedStat.st_mode);
@@ -946 +949 @@
     }
     InvalidateCache();
-    return NSRESULT_FOR_IPRT(RTErrConvertFromErrno(result));
+    int vrc = RTErrConvertFromErrno(result);
+    return NSRESULT_FOR_IPRT(vrc);
 }
 
@@ -1153 +1157 @@
  
     // <brendan, after jband> I promise to play nice
-    char *buffer   = mPath.BeginWriting(),
-         *slashp   = buffer;
+    char *buffer   = mPath.BeginWriting();
 
     // find the last significant slash in buffer
-    slashp = strrchr(buffer, '/');
+    char *slashp = strrchr(buffer, '/');
     NS_ASSERTION(slashp, "non-canonical mPath?");
     if (!slashp)

trunk/src/libs/xpcom18a4/xpcom/io/nsNativeCharsetUtils.cpp

@@ -706 +706 @@
         int incr;
 
-        while (*inputLeft && *outputLeft >= MB_CUR_MAX) {
+        /* MB_CUR_MAX better be positive. */
+        while (*inputLeft && *outputLeft >= (PRUint32)MB_CUR_MAX) {
 #ifdef HAVE_WCRTOMB
             incr = (int) wcrtomb(*output, (wchar_t) **input, &ps);