tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

commit 1379eb90e3d29669a05dcd25c0e9137c1df2f9db
parent 352465171adece70a35f4e2ae39668244cdcdeaa
Author: Michael Froman <mfroman@mozilla.com>
Date:   Tue, 18 Nov 2025 17:44:40 +0000

Bug 2000353 - remove unused files nr_socket_wrapper.{c|h} r=bwc,ng

Differential Revision: https://phabricator.services.mozilla.com/D272755

Diffstat:
Mdom/media/webrtc/transport/third_party/nICEr/nicer.gyp | 2--
Mdom/media/webrtc/transport/third_party/nICEr/src/ice/ice_component.c | 1-
Mdom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h | 1-
Ddom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.c | 84-------------------------------------------------------------------------------
Ddom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.h | 63---------------------------------------------------------------
5 files changed, 0 insertions(+), 151 deletions(-)

diff --git a/dom/media/webrtc/transport/third_party/nICEr/nicer.gyp b/dom/media/webrtc/transport/third_party/nICEr/nicer.gyp @@ -61,8 +61,6 @@ # Net "./src/net/nr_resolver.c", "./src/net/nr_resolver.h", - "./src/net/nr_socket_wrapper.c", - "./src/net/nr_socket_wrapper.h", "./src/net/nr_socket.c", "./src/net/nr_socket.h", "./src/net/nr_socket_local.h", diff --git a/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_component.c b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_component.c @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "stun.h" #include "nr_socket_local.h" #include "nr_socket_turn.h" -#include "nr_socket_wrapper.h" #include "nr_socket_buffered_stun.h" #include "nr_socket_multi_tcp.h" #include "ice_reg.h" diff --git a/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h b/dom/media/webrtc/transport/third_party/nICEr/src/ice/ice_ctx.h @@ -44,7 +44,6 @@ extern "C" { #include "nr_socket.h" #include "nr_resolver.h" #include "nr_interface_prioritizer.h" -#include "nr_socket_wrapper.h" #include "stun_client_ctx.h" #include "stun_server_ctx.h" #include "turn_client_ctx.h" diff --git a/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.c b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.c @@ -1,84 +0,0 @@ -/* -Copyright (c) 2007, Adobe Systems, Incorporated -Copyright (c) 2013, Mozilla - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -* Neither the name of Adobe Systems, Network Resonance, Mozilla nor - the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include <nr_api.h> -#include "nr_socket_wrapper.h" - -#include <assert.h> - -int nr_socket_wrapper_factory_create_int(void *obj, nr_socket_wrapper_factory_vtbl *vtbl, - nr_socket_wrapper_factory **wrapperp) -{ - int _status; - nr_socket_wrapper_factory *wrapper=0; - - if (!(wrapper=RCALLOC(sizeof(nr_socket_wrapper_factory)))) - ABORT(R_NO_MEMORY); - - wrapper->obj=obj; - wrapper->vtbl=vtbl; - - *wrapperp=wrapper; - _status=0; -abort: - return(_status); -} - -int nr_socket_wrapper_factory_wrap(nr_socket_wrapper_factory *wrapper, - nr_socket *inner, - nr_socket **socketp) -{ - return wrapper->vtbl->wrap(wrapper->obj, inner, socketp); -} - -int nr_socket_wrapper_factory_destroy(nr_socket_wrapper_factory **wrapperp) -{ - nr_socket_wrapper_factory *wrapper; - - if (!wrapperp || !*wrapperp) - return 0; - - wrapper = *wrapperp; - *wrapperp = 0; - - assert(wrapper->vtbl); - if (wrapper->vtbl) - wrapper->vtbl->destroy(&wrapper->obj); - - RFREE(wrapper); - - return 0; -} - diff --git a/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.h b/dom/media/webrtc/transport/third_party/nICEr/src/net/nr_socket_wrapper.h @@ -1,63 +0,0 @@ -/* -Copyright (c) 2007, Adobe Systems, Incorporated -Copyright (c) 2013, Mozilla - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -* Neither the name of Adobe Systems, Network Resonance, Mozilla nor - the names of its contributors may be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _nr_socket_wrapper_h -#define _nr_socket_wrapper_h - -#include "nr_socket.h" - -typedef struct nr_socket_wrapper_factory_vtbl_ { - int (*wrap)(void *obj, - nr_socket *socket, - nr_socket **socketp); - int (*destroy)(void **obj); -} nr_socket_wrapper_factory_vtbl; - -typedef struct nr_socket_wrapper_factory_ { - void *obj; - nr_socket_wrapper_factory_vtbl *vtbl; -} nr_socket_wrapper_factory; - - -int nr_socket_wrapper_factory_create_int(void *obj, nr_socket_wrapper_factory_vtbl *vtbl, - nr_socket_wrapper_factory **wrapperp); - - -int nr_socket_wrapper_factory_wrap(nr_socket_wrapper_factory *wrapper, nr_socket *inner, - nr_socket **socketp); - -int nr_socket_wrapper_factory_destroy(nr_socket_wrapper_factory **wrapperp); - -#endif