Changeset 102457 in vbox for trunk/src/libs/xpcom18a4/xpcom/io

Timestamp:

Dec 4, 2023 5:24:33 PM (17 months ago)

Author:

vboxsync

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

160600

Message:

libs/xpcom: Get rid of PL_strcmp/PL_strncmp and replace with IPRT equivalents, bugref:10545

File:

• trunk/src/libs/xpcom18a4/xpcom/io/nsAppFileLocationProvider.cpp (modified) (13 diffs)

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

@@ -37 +37 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#include <iprt/string.h>
 
 #include "nsAppFileLocationProvider.h"
@@ -133 +134 @@
     *persistant = PR_TRUE;
 
-    if (nsCRT::strcmp(prop, NS_APP_APPLICATION_REGISTRY_DIR) == 0)
+    if (RTStrCmp(prop, NS_APP_APPLICATION_REGISTRY_DIR) == 0)
     {
         rv = GetProductDirectory(getter_AddRefs(localFile));
     }
-    else if (nsCRT::strcmp(prop, NS_APP_APPLICATION_REGISTRY_FILE) == 0)
+    else if (RTStrCmp(prop, NS_APP_APPLICATION_REGISTRY_FILE) == 0)
     {
         rv = GetProductDirectory(getter_AddRefs(localFile));
@@ -143 +144 @@
             rv = localFile->AppendNative(APP_REGISTRY_NAME);
     }
-    else if (nsCRT::strcmp(prop, NS_APP_DEFAULTS_50_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_DEFAULTS_50_DIR) == 0)
     {
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
@@ -149 +150 @@
             rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME);
     }
-    else if (nsCRT::strcmp(prop, NS_APP_PREF_DEFAULTS_50_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_PREF_DEFAULTS_50_DIR) == 0)
     {
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
@@ -158 +159 @@
         }
     }
-    else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0 ||
-             nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0 ||
+             RTStrCmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0)
     {
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
@@ -168 +169 @@
         }
     }
-    else if (nsCRT::strcmp(prop, NS_APP_USER_PROFILES_ROOT_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_USER_PROFILES_ROOT_DIR) == 0)
     {
         rv = GetDefaultUserProfileRoot(getter_AddRefs(localFile));
     }
-    else if (nsCRT::strcmp(prop, NS_APP_RES_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_RES_DIR) == 0)
     {
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
@@ -178 +179 @@
             rv = localFile->AppendRelativeNativePath(RES_DIR_NAME);
     }
-    else if (nsCRT::strcmp(prop, NS_APP_CHROME_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_CHROME_DIR) == 0)
     {
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
@@ -184 +185 @@
             rv = localFile->AppendRelativeNativePath(CHROME_DIR_NAME);
     }
-    else if (nsCRT::strcmp(prop, NS_APP_PLUGINS_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_PLUGINS_DIR) == 0)
     {
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
@@ -190 +191 @@
             rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
     }
-    else if (nsCRT::strcmp(prop, NS_ENV_PLUGINS_DIR) == 0)
+    else if (RTStrCmp(prop, NS_ENV_PLUGINS_DIR) == 0)
     {
         NS_ERROR("Don't use nsAppFileLocationProvider::GetFile(NS_ENV_PLUGINS_DIR, ...). "
@@ -198 +199 @@
             rv = NS_NewNativeLocalFile(nsDependentCString(pathVar), PR_TRUE, getter_AddRefs(localFile));
     }
-    else if (nsCRT::strcmp(prop, NS_USER_PLUGINS_DIR) == 0)
+    else if (RTStrCmp(prop, NS_USER_PLUGINS_DIR) == 0)
     {
         rv = GetProductDirectory(getter_AddRefs(localFile));
@@ -204 +205 @@
             rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
     }
-    else if (nsCRT::strcmp(prop, NS_APP_SEARCH_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_SEARCH_DIR) == 0)
     {
         rv = CloneMozBinDirectory(getter_AddRefs(localFile));
@@ -210 +211 @@
             rv = localFile->AppendRelativeNativePath(SEARCH_DIR_NAME);
     }
-    else if (nsCRT::strcmp(prop, NS_APP_INSTALL_CLEANUP_DIR) == 0)
+    else if (RTStrCmp(prop, NS_APP_INSTALL_CLEANUP_DIR) == 0)
     {
         // This is cloned so that embeddors will have a hook to override
@@ -466 +467 @@
     nsresult rv = NS_ERROR_FAILURE;
 
-    if (!nsCRT::strcmp(prop, NS_APP_PLUGINS_DIR_LIST))
+    if (!RTStrCmp(prop, NS_APP_PLUGINS_DIR_LIST))
     {
         static const char* keys[] = { nsnull, NS_APP_PLUGINS_DIR, nsnull };