commit 852419e5ff759a256730cfb4a23104086c9babe9
parent 375dfa56f9d4ef80c920149eac36a32ff9e2ed19
Author: Michael Froman <mfroman@mozilla.com>
Date: Tue, 18 Nov 2025 17:44:38 +0000
Bug 2000353 - virtually everything in nr_common.h was unused r=bwc,ng
Differential Revision: https://phabricator.services.mozilla.com/D272749
Diffstat:
9 files changed, 9 insertions(+), 117 deletions(-)
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/nrappkit.gyp b/dom/media/webrtc/transport/third_party/nrappkit/nrappkit.gyp
@@ -26,7 +26,6 @@
'sources' : [
# Shared
- './src/share/nr_common.h',
'./src/port/generic/include'
# libekr
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c b/dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c
@@ -53,8 +53,7 @@
#include <registry.h>
#include <time.h>
-
-#include "nr_common.h"
+#include <csi_platform.h>
#define LOGGING_DEFAULT_LEVEL 5
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c
@@ -53,11 +53,11 @@
#include <openssl/ssl.h>
#endif
#include <ctype.h>
+#include <csi_platform.h>
#include "registry.h"
#include "registry_int.h"
#include "registry_vtbl.h"
#include "r_assoc.h"
-#include "nr_common.h"
#include "r_log.h"
#include "r_errors.h"
#include "r_macros.h"
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_local.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_local.c
@@ -54,11 +54,11 @@
#endif
#include <ctype.h>
#include <stdlib.h>
+#include <csi_platform.h>
#include "registry.h"
#include "registry_int.h"
#include "registry_vtbl.h"
#include "r_assoc.h"
-#include "nr_common.h"
#include "r_log.h"
#include "r_errors.h"
#include "r_macros.h"
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registrycb.c
@@ -44,11 +44,11 @@
#include <assert.h>
#include <string.h>
+#include <csi_platform.h>
#include "registry.h"
#include "registry_int.h"
#include "r_assoc.h"
#include "r_errors.h"
-#include "nr_common.h"
#include "r_log.h"
#include "r_macros.h"
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_common.h b/dom/media/webrtc/transport/third_party/nrappkit/src/share/nr_common.h
@@ -1,108 +0,0 @@
-/**
- nr_common.h
-
-
- Copyright (C) 2006, Network Resonance, Inc.
- All Rights Reserved
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. Neither the name of Network Resonance, Inc. nor the name of any
- contributors to this software 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_common_h
-#define _nr_common_h
-
-#include <csi_platform.h>
-
-#ifdef USE_MPATROL
-#define USEDEBUG 1
-#include <mpatrol.h>
-#endif
-
-#ifdef USE_DMALLOC
-#include <dmalloc.h>
-#endif
-
-#include <string.h>
-#include <time.h>
-
-#ifdef WIN32
-#include <winsock2.h>
-#include <errno.h>
-#else
-#include <sys/errno.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <r_log.h>
-
-extern int NR_LOG_REASSD;
-
-#include "registry.h"
-#include "nrstats.h"
-
-typedef struct nr_captured_packet_ {
- UCHAR cap_interface; /* 1 for primary, 2 for secondary */
- struct timeval ts; /* The time this packet was captured */
- UINT4 len; /* The length of the packet */
- UINT8 packet_number; /* The listener's packet index */
-} nr_captured_packet;
-
-#ifndef NR_ROOT_PATH
-#define NR_ROOT_PATH "/usr/local/ctc/"
-#endif
-
-#define NR_ARCHIVE_DIR NR_ROOT_PATH "archive/"
-#define NR_TEMP_DIR NR_ROOT_PATH "tmp/"
-#define NR_ARCHIVE_STATEFILE NR_ROOT_PATH "archive/state"
-#define NR_CAPTURED_PID_FILENAME NR_ROOT_PATH "captured.pid"
-#define NR_REASSD_PID_FILENAME NR_ROOT_PATH "reassd.pid"
-#define NR_MODE_FILENAME NR_ROOT_PATH "mode.txt"
-
-char *nr_revision_number(void);
-
-
-
-
-/* Memory buckets for CTC memory types */
-#define NR_MEM_TCP 1
-#define NR_MEM_HTTP 2
-#define NR_MEM_DELIVERY 3
-#define NR_MEM_OUT_HM 4
-#define NR_MEM_OUT_SSL 5
-#define NR_MEM_SSL 7
-#define NR_MEM_COMMON 8
-#define NR_MEM_CODEC 9
-
-#endif
-
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/byteorder.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/byteorder.c
@@ -35,10 +35,10 @@
briank@networkresonance.com Wed May 16 16:46:00 PDT 2007
*/
-#include "nr_common.h"
#ifndef WIN32
#include <arpa/inet.h>
#endif
+#include <csi_platform.h>
#include "r_types.h"
#include "byteorder.h"
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/p_buf.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/p_buf.c
@@ -40,7 +40,9 @@
#include <string.h>
#include <stddef.h>
-#include "nr_common.h"
+#include <sys/queue.h>
+#include <csi_platform.h>
+#include <r_log.h>
#include "p_buf.h"
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.c
@@ -48,7 +48,7 @@
#ifdef OPENSSL
#include <openssl/evp.h>
#endif
-#include "nr_common.h"
+#include <csi_platform.h>
#include "r_common.h"
#include "registry.h"
#include "util.h"
