summaryrefslogtreecommitdiffstats
path: root/js/xpconnect
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-05-03 06:28:20 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-05-03 06:28:20 +0200
commit755e3a48bf58ca128107cf656a5900806a09d5eb (patch)
tree4c6b3cf06af422c12c33084d4551bac92ce0a3ab /js/xpconnect
parent43f7a588f96aaf88e7b69441c3b50bc9c7b20df7 (diff)
downloadUXP-755e3a48bf58ca128107cf656a5900806a09d5eb.tar
UXP-755e3a48bf58ca128107cf656a5900806a09d5eb.tar.gz
UXP-755e3a48bf58ca128107cf656a5900806a09d5eb.tar.lz
UXP-755e3a48bf58ca128107cf656a5900806a09d5eb.tar.xz
UXP-755e3a48bf58ca128107cf656a5900806a09d5eb.zip
Remove unused XREShellData
Diffstat (limited to 'js/xpconnect')
-rw-r--r--js/xpconnect/shell/xpcshell.cpp4
-rw-r--r--js/xpconnect/src/XPCShellImpl.cpp5
2 files changed, 2 insertions, 7 deletions
diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp
index 4521dc52f..4eef3f6bf 100644
--- a/js/xpconnect/shell/xpcshell.cpp
+++ b/js/xpconnect/shell/xpcshell.cpp
@@ -50,9 +50,7 @@ main(int argc, char** argv, char** envp)
DllBlocklist_Initialize();
#endif
- XREShellData shellData;
-
- int result = XRE_XPCShellMain(argc, argv, envp, &shellData);
+ int result = XRE_XPCShellMain(argc, argv, envp);
#ifdef XP_MACOSX
FinishAutoreleasePool();
diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp
index f6c74f9b2..a6432856d 100644
--- a/js/xpconnect/src/XPCShellImpl.cpp
+++ b/js/xpconnect/src/XPCShellImpl.cpp
@@ -1232,11 +1232,8 @@ GetCurrentWorkingDirectory(nsAString& workingDirectory)
static JSSecurityCallbacks shellSecurityCallbacks;
int
-XRE_XPCShellMain(int argc, char** argv, char** envp,
- const XREShellData* aShellData)
+XRE_XPCShellMain(int argc, char** argv, char** envp)
{
- MOZ_ASSERT(aShellData);
-
JSContext* cx;
int result = 0;
nsresult rv;