summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2021-09-27 00:17:49 -0400
committerMoonchild <moonchild@palemoon.org>2022-04-01 14:32:45 +0200
commitcdff23ad0b3e0be2121c77a5b2415b15c7c4f0b2 (patch)
treebeac728f6c9046ce0413dce59e50be0065373f1c
parent3635039d2be6264673f3b89b8df390f03159fcaa (diff)
downloaduxp-cdff23ad0b3e0be2121c77a5b2415b15c7c4f0b2.tar.gz
Bug 1340030 - Remove necko_standalone lib
The only users of this library were removed by Bug 1239866 and Bug 1239870 as part of the larger removal of libxpcomrt in Bug 1237409. This was done before our fork point..
-rw-r--r--netwerk/moz.build1
-rw-r--r--netwerk/standalone/moz.build52
-rw-r--r--netwerk/standalone/nsNetModuleStandalone.cpp118
-rw-r--r--netwerk/standalone/nsNetModuleStandalone.h13
4 files changed, 0 insertions, 184 deletions
diff --git a/netwerk/moz.build b/netwerk/moz.build
index 79f4cd53c0..d9c3348f46 100644
--- a/netwerk/moz.build
+++ b/netwerk/moz.build
@@ -15,7 +15,6 @@ DIRS += [
'protocol',
'system',
'ipc',
- 'standalone',
]
if CONFIG['MOZ_SRTP']:
diff --git a/netwerk/standalone/moz.build b/netwerk/standalone/moz.build
deleted file mode 100644
index e78ea7784d..0000000000
--- a/netwerk/standalone/moz.build
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['OS_TARGET'] != 'WINNT':
- Library('necko_standalone')
-
-src_list = [
- 'nsNetModuleStandalone.cpp',
-]
-
-netwerk_base_src = [
- 'PollableEvent.cpp',
- 'nsDNSPrefetch.cpp',
- 'nsNetAddr.cpp',
- 'nsSocketTransportService2.cpp',
- 'nsURLHelper.cpp',
-]
-src_list += [
- '/netwerk/base/%s' % s for s in netwerk_base_src
-]
-
-netwerk_dns_src = [
- 'nsHostResolver.cpp',
- 'DNS.cpp',
- 'DNSListenerProxy.cpp',
- 'GetAddrInfo.cpp',
- 'nsDNSService2.cpp',
- 'nsIDNService.cpp',
- 'punycode.c',
-]
-src_list += [
- '/netwerk/dns/%s' % s for s in netwerk_dns_src
-]
-
-SOURCES += sorted(src_list)
-
-LOCAL_INCLUDES = [
- '../base',
- '../build',
- '../dns',
-]
-
-DEFINES['IDNA2008'] = False
-DEFINES['MOZILLA_INTERNAL_API'] = True
-DEFINES['MOZILLA_EXTERNAL_LINKAGE'] = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-if CONFIG['GNU_CXX']:
- CXXFLAGS += ['-Wno-error=shadow']
diff --git a/netwerk/standalone/nsNetModuleStandalone.cpp b/netwerk/standalone/nsNetModuleStandalone.cpp
deleted file mode 100644
index 22028bde42..0000000000
--- a/netwerk/standalone/nsNetModuleStandalone.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "necko-config.h"
-
-#include "mozilla/ModuleUtils.h"
-#include "mozilla/DebugOnly.h"
-#include "nsCOMPtr.h"
-#include "nsICategoryManager.h"
-#include "nsIClassInfoImpl.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsNetCID.h"
-#include "nsPIDNSService.h"
-#include "nsPISocketTransportService.h"
-#include "nscore.h"
-
-extern const mozilla::Module kNeckoStandaloneModule;
-
-namespace mozilla {
-
-nsresult
-InitNetModuleStandalone()
-{
- nsresult rv;
-
- nsCOMPtr<nsPIDNSService> dns = do_GetService(NS_DNSSERVICE_CONTRACTID, &rv);
- if (NS_SUCCEEDED(rv)) {
- mozilla::DebugOnly<nsresult> rv = dns->Init();
- NS_ASSERTION(NS_SUCCEEDED(rv), "DNS service init failed");
- } else {
- NS_WARNING("failed to get dns service");
- }
-
- nsCOMPtr<nsPISocketTransportService> sts = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
- if (NS_SUCCEEDED(rv)) {
- mozilla::DebugOnly<nsresult> rv = sts->Init();
- NS_ASSERTION(NS_SUCCEEDED(rv), "Socket transport service init failed");
- } else {
- NS_WARNING("failed to get socket transport service");
- }
-
- return NS_OK;
-}
-
-nsresult
-ShutdownNetModuleStandalone()
-{
- nsresult rv;
-
- nsCOMPtr<nsPIDNSService> dns = do_GetService(NS_DNSSERVICE_CONTRACTID, &rv);
- if (NS_SUCCEEDED(rv)) {
- mozilla::DebugOnly<nsresult> rv = dns->Shutdown();
- NS_ASSERTION(NS_SUCCEEDED(rv), "DNS service shutdown failed");
- } else {
- NS_WARNING("failed to get dns service");
- }
-
- nsCOMPtr<nsPISocketTransportService> sts = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &rv);
- if (NS_SUCCEEDED(rv)) {
- mozilla::DebugOnly<nsresult> rv = sts->Shutdown(true);
- NS_ASSERTION(NS_SUCCEEDED(rv), "Socket transport service shutdown failed");
- } else {
- NS_WARNING("failed to get socket transport service");
- }
-
- return NS_OK;
-}
-
-} // namespace mozilla
-
-#include "nsDNSService2.h"
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIDNSService,
- nsDNSService::GetXPCOMSingleton)
-
-#include "nsSocketTransportService2.h"
-typedef mozilla::net::nsSocketTransportService nsSocketTransportService;
-#undef LOG
-#undef LOG_ENABLED
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSocketTransportService, Init)
-
-// Net module startup hook
-static nsresult nsNetStartup()
-{
- return NS_OK;
-}
-
-// Net module shutdown hook
-static void nsNetShutdown()
-{
-}
-
-NS_DEFINE_NAMED_CID(NS_SOCKETTRANSPORTSERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_DNSSERVICE_CID);
-
-static const mozilla::Module::CIDEntry kNeckoCIDs[] = {
- { &kNS_SOCKETTRANSPORTSERVICE_CID, false, nullptr, nsSocketTransportServiceConstructor },
- { &kNS_DNSSERVICE_CID, false, nullptr, nsIDNSServiceConstructor },
- { nullptr }
-};
-
-static const mozilla::Module::ContractIDEntry kNeckoContracts[] = {
- { NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &kNS_SOCKETTRANSPORTSERVICE_CID },
- { NS_DNSSERVICE_CONTRACTID, &kNS_DNSSERVICE_CID },
- { nullptr }
-};
-
-const mozilla::Module kNeckoStandaloneModule = {
- mozilla::Module::kVersion,
- kNeckoCIDs,
- kNeckoContracts,
- nullptr,
- nullptr,
- nsNetStartup,
- nsNetShutdown
-};
diff --git a/netwerk/standalone/nsNetModuleStandalone.h b/netwerk/standalone/nsNetModuleStandalone.h
deleted file mode 100644
index a9fe922770..0000000000
--- a/netwerk/standalone/nsNetModuleStandalone.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ns_net_module_standalone_h_
-#define ns_net_module_standalone_h_
-
-#include <nsError.h>
-
-namespace mozilla {
-
-nsresult InitNetModuleStandalone();
-nsresult ShutdownNetModuleStandalone();
-
-} // namespace mozilla
-
-#endif // ns_net_module_standalone_h_