commit 35d4afcff2b21a315d8a58e97fe243d388281c33
parent 473ed32bda24ea5a5b68aa5788904b4625791c69
Author: Michael Froman <mfroman@mozilla.com>
Date: Tue, 18 Nov 2025 22:29:08 +0000
Bug 2000353 - remove unused functions from registry.{c|h} and util.{c|h} r=bwc,ng
Differential Revision: https://phabricator.services.mozilla.com/D272747
Diffstat:
6 files changed, 2 insertions(+), 564 deletions(-)
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
@@ -127,11 +127,9 @@ func(NR_registry name, type *out) \
NRREGGET(NR_reg_get_char, get_char, char)
NRREGGET(NR_reg_get_uchar, get_uchar, UCHAR)
-NRREGGET(NR_reg_get_int2, get_int2, INT2)
NRREGGET(NR_reg_get_uint2, get_uint2, UINT2)
NRREGGET(NR_reg_get_int4, get_int4, INT4)
NRREGGET(NR_reg_get_uint4, get_uint4, UINT4)
-NRREGGET(NR_reg_get_int8, get_int8, INT8)
NRREGGET(NR_reg_get_uint8, get_uint8, UINT8)
NRREGGET(NR_reg_get_double, get_double, double)
@@ -159,12 +157,6 @@ NR_reg_get_length(NR_registry name, size_t *length)
return reg_vtbl->vtbl->get_length(name, length);
}
-int
-NR_reg_get_type(NR_registry name, NR_registry_type type)
-{
- return reg_vtbl->vtbl->get_type(name, type);
-}
-
#define NRREGSET(func, method, type) \
int \
func(NR_registry name, type data) \
@@ -174,13 +166,8 @@ func(NR_registry name, type data) \
NRREGSET(NR_reg_set_char, set_char, char)
NRREGSET(NR_reg_set_uchar, set_uchar, UCHAR)
-NRREGSET(NR_reg_set_int2, set_int2, INT2)
-NRREGSET(NR_reg_set_uint2, set_uint2, UINT2)
NRREGSET(NR_reg_set_int4, set_int4, INT4)
NRREGSET(NR_reg_set_uint4, set_uint4, UINT4)
-NRREGSET(NR_reg_set_int8, set_int8, INT8)
-NRREGSET(NR_reg_set_uint8, set_uint8, UINT8)
-NRREGSET(NR_reg_set_double, set_double, double)
NRREGSET(NR_reg_set_string, set_string, char*)
int
@@ -203,12 +190,6 @@ NR_reg_del(NR_registry name)
}
int
-NR_reg_fin(NR_registry name)
-{
- return reg_vtbl->vtbl->fin(name);
-}
-
-int
NR_reg_get_child_count(NR_registry parent, unsigned int *count)
{
assert(sizeof(count) == sizeof(size_t));
@@ -248,19 +229,6 @@ NR_reg_get_child_registry(NR_registry parent, unsigned int i, NR_registry child)
return(_status);
}
-int
-NR_reg_dump()
-{
- int r, _status;
-
- if ((r=reg_vtbl->vtbl->dump(0)))
- ABORT(r);
-
- _status=0;
- abort:
- return(_status);
-}
-
// convenience methods, call RFREE on the returned data
int
NR_reg_alloc_data(NR_registry name, Data *data)
@@ -388,50 +356,10 @@ abort: \
NRGET2(NR_reg_get2_char, char, NR_reg_get_char)
NRGET2(NR_reg_get2_uchar, UCHAR, NR_reg_get_uchar)
-NRGET2(NR_reg_get2_int2, INT2, NR_reg_get_int2)
NRGET2(NR_reg_get2_uint2, UINT2, NR_reg_get_uint2)
-NRGET2(NR_reg_get2_int4, INT4, NR_reg_get_int4)
-NRGET2(NR_reg_get2_uint4, UINT4, NR_reg_get_uint4)
-NRGET2(NR_reg_get2_int8, INT8, NR_reg_get_int8)
-NRGET2(NR_reg_get2_uint8, UINT8, NR_reg_get_uint8)
-NRGET2(NR_reg_get2_double, double, NR_reg_get_double)
NRGET2(NR_reg_alloc2_string, char*, NR_reg_alloc_string)
NRGET2(NR_reg_alloc2_data, Data, NR_reg_alloc_data)
-int
-NR_reg_get2_bytes(NR_registry parent, char *child, UCHAR *out, size_t size, size_t *length)
-{
- int r, _status;
- NR_registry registry;
-
- if ((r=NR_reg_make_registry(parent, child, registry)))
- ABORT(r);
-
- if ((r=NR_reg_get_bytes(registry, out, size, length)))
- ABORT(r);
-
- _status = 0;
-abort:
- return (_status);
-}
-
-int
-NR_reg_get2_string(NR_registry parent, char *child, char *out, size_t size)
-{
- int r, _status;
- NR_registry registry;
-
- if ((r=NR_reg_make_registry(parent, child, registry)))
- ABORT(r);
-
- if ((r=NR_reg_get_string(registry, out, size)))
- ABORT(r);
-
- _status = 0;
-abort:
- return (_status);
-}
-
/* More convenience functions: the same as their parents but they
take a prefix and a suffix */
#define NRSET2(func, type, set) \
@@ -453,67 +381,9 @@ abort: \
return (_status); \
}
-NRSET2(NR_reg_set2_char, char, NR_reg_set_char)
NRSET2(NR_reg_set2_uchar, UCHAR, NR_reg_set_uchar)
-NRSET2(NR_reg_set2_int2, INT2, NR_reg_set_int2)
-NRSET2(NR_reg_set2_uint2, UINT2, NR_reg_set_uint2)
-NRSET2(NR_reg_set2_int4, INT4, NR_reg_set_int4)
-NRSET2(NR_reg_set2_uint4, UINT4, NR_reg_set_uint4)
-NRSET2(NR_reg_set2_int8, INT8, NR_reg_set_int8)
-NRSET2(NR_reg_set2_uint8, UINT8, NR_reg_set_uint8)
-NRSET2(NR_reg_set2_double, double, NR_reg_set_double)
NRSET2(NR_reg_set2_string, char*, NR_reg_set_string)
-int
-NR_reg_set2_bytes(NR_registry prefix, char *name, UCHAR *data, size_t length)
-{
- int r, _status;
- NR_registry registry;
-
- if ((r = NR_reg_make_registry(prefix, name, registry)))
- ABORT(r);
-
- if ((r = NR_reg_set_bytes(registry, data, length)))
- ABORT(r);
-
- _status = 0;
-abort:
- return (_status);
-}
-
-
-int
-NR_reg_make_child_registry(NR_registry parent, NR_registry descendant, unsigned int generation, NR_registry child)
-{
- int _status;
- size_t length;
-
- length = strlen(parent);
-
- if (strncasecmp(parent, descendant, length))
- ABORT(R_BAD_ARGS);
-
- while (descendant[length] != '\0') {
- if (descendant[length] == '.') {
- if (generation == 0)
- break;
-
- --generation;
- }
-
- ++length;
- if (length >= sizeof(NR_registry))
- ABORT(R_BAD_ARGS);
- }
-
- strncpy(child, descendant, length);
- child[length] = '\0';
-
- _status=0;
- abort:
- return(_status);
-}
-
/* requires parent already in legal form */
int
NR_reg_make_registry(NR_registry parent, char *child, NR_registry out)
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.h b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.h
@@ -67,11 +67,9 @@ int NR_reg_initted(void);
int NR_reg_get_char(NR_registry name, char *out);
int NR_reg_get_uchar(NR_registry name, UCHAR *out);
-int NR_reg_get_int2(NR_registry name, INT2 *out);
int NR_reg_get_uint2(NR_registry name, UINT2 *out);
int NR_reg_get_int4(NR_registry name, INT4 *out);
int NR_reg_get_uint4(NR_registry name, UINT4 *out);
-int NR_reg_get_int8(NR_registry name, INT8 *out);
int NR_reg_get_uint8(NR_registry name, UINT8 *out);
int NR_reg_get_double(NR_registry name, double *out);
int NR_reg_get_registry(NR_registry name, NR_registry out);
@@ -79,61 +77,34 @@ int NR_reg_get_registry(NR_registry name, NR_registry out);
int NR_reg_get_bytes(NR_registry name, UCHAR *out, size_t size, size_t *length);
int NR_reg_get_string(NR_registry name, char *out, size_t size);
int NR_reg_get_length(NR_registry name, size_t *length);
-int NR_reg_get_type(NR_registry name, NR_registry_type type);
int NR_reg_get2_char(NR_registry prefix, char *name, char *);
int NR_reg_get2_uchar(NR_registry prefix, char *name, UCHAR *);
-int NR_reg_get2_int2(NR_registry prefix, char *name, INT2 *);
int NR_reg_get2_uint2(NR_registry prefix, char *name, UINT2 *);
-int NR_reg_get2_int4(NR_registry prefix, char *name, INT4 *);
-int NR_reg_get2_uint4(NR_registry prefix, char *name, UINT4 *);
-int NR_reg_get2_int8(NR_registry prefix, char *name, INT8 *);
-int NR_reg_get2_uint8(NR_registry prefix, char *name, UINT8 *);
-int NR_reg_get2_double(NR_registry prefix, char *name, double *);
-int NR_reg_get2_bytes(NR_registry prefix, char *name, UCHAR *out, size_t size, size_t *length);
-int NR_reg_get2_string(NR_registry prefix, char *name, char *out, size_t size);
int NR_reg_alloc2_string(NR_registry prefix, char *name, char **);
int NR_reg_alloc2_data(NR_registry prefix, char *name, Data *);
int NR_reg_set_char(NR_registry name, char data);
int NR_reg_set_uchar(NR_registry name, UCHAR data);
-int NR_reg_set_int2(NR_registry name, INT2 data);
-int NR_reg_set_uint2(NR_registry name, UINT2 data);
int NR_reg_set_int4(NR_registry name, INT4 data);
int NR_reg_set_uint4(NR_registry name, UINT4 data);
-int NR_reg_set_int8(NR_registry name, INT8 data);
-int NR_reg_set_uint8(NR_registry name, UINT8 data);
-int NR_reg_set_double(NR_registry name, double data);
int NR_reg_set_registry(NR_registry name);
int NR_reg_set_bytes(NR_registry name, UCHAR *data, size_t length);
int NR_reg_set_string(NR_registry name, char *data);
-int NR_reg_set2_char(NR_registry prefix, char *name, char data);
int NR_reg_set2_uchar(NR_registry prefix, char *name, UCHAR data);
-int NR_reg_set2_int2(NR_registry prefix, char *name, INT2 data);
-int NR_reg_set2_uint2(NR_registry prefix, char *name, UINT2 data);
-int NR_reg_set2_int4(NR_registry prefix, char *name, INT4 data);
-int NR_reg_set2_uint4(NR_registry prefix, char *name, UINT4 data);
-int NR_reg_set2_int8(NR_registry prefix, char *name, INT8 data);
-int NR_reg_set2_uint8(NR_registry prefix, char *name, UINT8 data);
-int NR_reg_set2_double(NR_registry prefix, char *name, double data);
-
-int NR_reg_set2_bytes(NR_registry prefix, char *name, UCHAR *data, size_t length);
+
int NR_reg_set2_string(NR_registry prefix, char *name, char *data);
int NR_reg_del(NR_registry name);
-int NR_reg_fin(NR_registry name);
-
int NR_reg_get_child_count(NR_registry parent, unsigned int *count);
int NR_reg_get_child_registry(NR_registry parent, unsigned int i, NR_registry child);
-int NR_reg_dump(void);
-
/* convenience methods, call RFREE on the returned data */
int NR_reg_alloc_data(NR_registry name, Data *data);
int NR_reg_alloc_string(NR_registry name, char **data);
@@ -146,6 +117,5 @@ int NR_reg_register_callback(NR_registry name, char action, void (*cb)(void *cb_
int NR_reg_unregister_callback(NR_registry name, char action, void (*cb)(void *cb_arg, char action, NR_registry name));
int NR_reg_make_registry(NR_registry parent, char *child, NR_registry out);
-int NR_reg_make_child_registry(NR_registry parent, NR_registry descendant, unsigned int generation, NR_registry child);
#endif
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
@@ -102,35 +102,25 @@ typedef struct nr_array_registry_node_ {
static int nr_reg_local_init(nr_registry_module *me);
static int nr_reg_local_get_char(NR_registry name, char *data);
static int nr_reg_local_get_uchar(NR_registry name, UCHAR *data);
-static int nr_reg_local_get_int2(NR_registry name, INT2 *data);
static int nr_reg_local_get_uint2(NR_registry name, UINT2 *data);
static int nr_reg_local_get_int4(NR_registry name, INT4 *data);
static int nr_reg_local_get_uint4(NR_registry name, UINT4 *data);
-static int nr_reg_local_get_int8(NR_registry name, INT8 *data);
static int nr_reg_local_get_uint8(NR_registry name, UINT8 *data);
static int nr_reg_local_get_double(NR_registry name, double *data);
static int nr_reg_local_get_registry(NR_registry name, NR_registry data);
static int nr_reg_local_get_bytes(NR_registry name, UCHAR *data, size_t size, size_t *length);
static int nr_reg_local_get_string(NR_registry name, char *data, size_t size);
static int nr_reg_local_get_length(NR_registry name, size_t *len);
-static int nr_reg_local_get_type(NR_registry name, NR_registry_type type);
static int nr_reg_local_set_char(NR_registry name, char data);
static int nr_reg_local_set_uchar(NR_registry name, UCHAR data);
-static int nr_reg_local_set_int2(NR_registry name, INT2 data);
-static int nr_reg_local_set_uint2(NR_registry name, UINT2 data);
static int nr_reg_local_set_int4(NR_registry name, INT4 data);
static int nr_reg_local_set_uint4(NR_registry name, UINT4 data);
-static int nr_reg_local_set_int8(NR_registry name, INT8 data);
-static int nr_reg_local_set_uint8(NR_registry name, UINT8 data);
-static int nr_reg_local_set_double(NR_registry name, double data);
static int nr_reg_local_set_registry(NR_registry name);
static int nr_reg_local_set_bytes(NR_registry name, UCHAR *data, size_t length);
static int nr_reg_local_set_string(NR_registry name, char *data);
static int nr_reg_local_del(NR_registry name);
static int nr_reg_local_get_child_count(NR_registry parent, size_t *count);
static int nr_reg_local_get_children(NR_registry parent, NR_registry *data, size_t size, size_t *length);
-static int nr_reg_local_fin(NR_registry name);
-static int nr_reg_local_dump(int sorted);
static int nr_reg_insert_node(char *name, void *node);
static int nr_reg_change_node(char *name, void *node, void *old);
static int nr_reg_get(char *name, int type, void *out);
@@ -160,7 +150,6 @@ static int nr_reg_local_iter(NR_registry prefix, int (*action)(void *ptr, r_asso
static int nr_reg_local_iter_delete(void *ptr, r_assoc_iterator *iter, char *prefix, char *name, nr_registry_node *node);
static int nr_reg_local_find_children(void *ptr, r_assoc_iterator *iter, char *prefix, char *name, nr_registry_node *node);
static int nr_reg_local_count_children(void *ptr, r_assoc_iterator *iter, char *prefix, char *name, nr_registry_node *node);
-static int nr_reg_local_dump_print(void *ptr, r_assoc_iterator *iter, char *prefix, char *name, nr_registry_node *node);
@@ -282,29 +271,6 @@ nr_reg_local_count_children(void *ptr, r_assoc_iterator *iter, char *prefix, cha
return 0;
}
-int
-nr_reg_local_dump_print(void *ptr, r_assoc_iterator *iter, char *prefix, char *name, nr_registry_node *node)
-{
- int _status;
- int freeit = 0;
- char *data = 0;
-
- /* only print leaf nodes */
- if (node->type != NR_REG_TYPE_REGISTRY) {
- data = nr_reg_alloc_node_data(name, node, &freeit);
- if (ptr)
- fprintf((FILE*)ptr, "%s: %s\n", name, data);
- else
- r_log(NR_LOG_REGISTRY, LOG_INFO, "%s: %s", name, data);
- if (freeit)
- RFREE(data);
- }
-
- _status=0;
- //abort:
- return(_status);
-}
-
int
nr_reg_rfree(void *ptr)
@@ -874,11 +840,9 @@ func(NR_registry name, type *out) \
NRREGLOCALGET(nr_reg_local_get_char, NR_REG_TYPE_CHAR, char)
NRREGLOCALGET(nr_reg_local_get_uchar, NR_REG_TYPE_UCHAR, UCHAR)
-NRREGLOCALGET(nr_reg_local_get_int2, NR_REG_TYPE_INT2, INT2)
NRREGLOCALGET(nr_reg_local_get_uint2, NR_REG_TYPE_UINT2, UINT2)
NRREGLOCALGET(nr_reg_local_get_int4, NR_REG_TYPE_INT4, INT4)
NRREGLOCALGET(nr_reg_local_get_uint4, NR_REG_TYPE_UINT4, UINT4)
-NRREGLOCALGET(nr_reg_local_get_int8, NR_REG_TYPE_INT8, INT8)
NRREGLOCALGET(nr_reg_local_get_uint8, NR_REG_TYPE_UINT8, UINT8)
NRREGLOCALGET(nr_reg_local_get_double, NR_REG_TYPE_DOUBLE, double)
@@ -933,30 +897,6 @@ nr_reg_local_get_length(NR_registry name, size_t *length)
return(_status);
}
-int
-nr_reg_local_get_type(NR_registry name, NR_registry_type type)
-{
- int r, _status;
- nr_registry_node *node = 0;
- char *str = 0;
-
- if ((r=nr_reg_is_valid(name)))
- ABORT(r);
-
- if ((r=r_assoc_fetch(nr_registry, name, strlen(name)+1, (void*)&node)))
- ABORT(r);
-
- str = nr_reg_type_name(node->type);
- if (! str)
- ABORT(R_BAD_ARGS);
-
- strncpy(type, str, sizeof(NR_registry_type));
-
- _status=0;
- abort:
- return(_status);
-}
-
#define NRREGLOCALSET(func, TYPE, type) \
int \
@@ -967,13 +907,8 @@ func(NR_registry name, type data) \
NRREGLOCALSET(nr_reg_local_set_char, NR_REG_TYPE_CHAR, char)
NRREGLOCALSET(nr_reg_local_set_uchar, NR_REG_TYPE_UCHAR, UCHAR)
-NRREGLOCALSET(nr_reg_local_set_int2, NR_REG_TYPE_INT2, INT2)
-NRREGLOCALSET(nr_reg_local_set_uint2, NR_REG_TYPE_UINT2, UINT2)
NRREGLOCALSET(nr_reg_local_set_int4, NR_REG_TYPE_INT4, INT4)
NRREGLOCALSET(nr_reg_local_set_uint4, NR_REG_TYPE_UINT4, UINT4)
-NRREGLOCALSET(nr_reg_local_set_int8, NR_REG_TYPE_INT8, INT8)
-NRREGLOCALSET(nr_reg_local_set_uint8, NR_REG_TYPE_UINT8, UINT8)
-NRREGLOCALSET(nr_reg_local_set_double, NR_REG_TYPE_DOUBLE, double)
int
nr_reg_local_set_registry(NR_registry name)
@@ -1081,67 +1016,31 @@ nr_reg_local_get_children(NR_registry parent, NR_registry *data, size_t size, si
return(_status);
}
-int
-nr_reg_local_fin(NR_registry name)
-{
- int r, _status;
-
- if ((r=nr_reg_raise_event(name, NR_REG_CB_ACTION_FINAL)))
- ABORT(r);
-
- _status=0;
- abort:
- return(_status);
-}
-
-int
-nr_reg_local_dump(int sorted)
-{
- int r, _status;
-
- if ((r=nr_reg_local_iter(NR_TOP_LEVEL_REGISTRY, nr_reg_local_dump_print, 0)))
- ABORT(r);
-
- _status=0;
- abort:
- return(_status);
-}
-
static nr_registry_module_vtbl nr_reg_local_vtbl = {
nr_reg_local_init,
nr_reg_local_get_char,
nr_reg_local_get_uchar,
- nr_reg_local_get_int2,
nr_reg_local_get_uint2,
nr_reg_local_get_int4,
nr_reg_local_get_uint4,
- nr_reg_local_get_int8,
nr_reg_local_get_uint8,
nr_reg_local_get_double,
nr_reg_local_get_registry,
nr_reg_local_get_bytes,
nr_reg_local_get_string,
nr_reg_local_get_length,
- nr_reg_local_get_type,
nr_reg_local_set_char,
nr_reg_local_set_uchar,
- nr_reg_local_set_int2,
- nr_reg_local_set_uint2,
nr_reg_local_set_int4,
nr_reg_local_set_uint4,
- nr_reg_local_set_int8,
- nr_reg_local_set_uint8,
- nr_reg_local_set_double,
nr_reg_local_set_registry,
nr_reg_local_set_bytes,
nr_reg_local_set_string,
nr_reg_local_del,
nr_reg_local_get_child_count,
- nr_reg_local_get_children,
- nr_reg_local_fin,
- nr_reg_local_dump
+ nr_reg_local_get_children
};
static nr_registry_module nr_reg_local_module = { 0, &nr_reg_local_vtbl };
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_vtbl.h b/dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry_vtbl.h
@@ -49,11 +49,9 @@ typedef struct nr_registry_module_vtbl_ {
int (*get_char)(NR_registry name, char *out);
int (*get_uchar)(NR_registry name, UCHAR *out);
- int (*get_int2)(NR_registry name, INT2 *out);
int (*get_uint2)(NR_registry name, UINT2 *out);
int (*get_int4)(NR_registry name, INT4 *out);
int (*get_uint4)(NR_registry name, UINT4 *out);
- int (*get_int8)(NR_registry name, INT8 *out);
int (*get_uint8)(NR_registry name, UINT8 *out);
int (*get_double)(NR_registry name, double *out);
int (*get_registry)(NR_registry name, NR_registry out);
@@ -61,17 +59,11 @@ typedef struct nr_registry_module_vtbl_ {
int (*get_bytes)(NR_registry name, UCHAR *out, size_t size, size_t *length);
int (*get_string)(NR_registry name, char *out, size_t size);
int (*get_length)(NR_registry name, size_t *length);
- int (*get_type)(NR_registry name, NR_registry_type type);
int (*set_char)(NR_registry name, char data);
int (*set_uchar)(NR_registry name, UCHAR data);
- int (*set_int2)(NR_registry name, INT2 data);
- int (*set_uint2)(NR_registry name, UINT2 data);
int (*set_int4)(NR_registry name, INT4 data);
int (*set_uint4)(NR_registry name, UINT4 data);
- int (*set_int8)(NR_registry name, INT8 data);
- int (*set_uint8)(NR_registry name, UINT8 data);
- int (*set_double)(NR_registry name, double data);
int (*set_registry)(NR_registry name);
int (*set_bytes)(NR_registry name, UCHAR *data, size_t length);
@@ -81,10 +73,6 @@ typedef struct nr_registry_module_vtbl_ {
int (*get_child_count)(NR_registry parent, size_t *count);
int (*get_children)(NR_registry parent, NR_registry *data, size_t size, size_t *length);
-
- int (*fin)(NR_registry name);
-
- int (*dump)(int sorted);
} nr_registry_module_vtbl;
struct nr_registry_module_ {
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
@@ -56,114 +56,6 @@
int nr_util_default_log_facility=LOG_COMMON;
-int nr_get_filename(char *base, char *name, char **namep)
- {
- int len=strlen(base)+strlen(name)+2;
- char *ret=0;
- int _status;
-
- if(!(ret=(char *)RMALLOC(len)))
- ABORT(R_NO_MEMORY);
- if(base[strlen(base)-1]!='/'){
- sprintf(ret,"%s/%s",base,name);
- }
- else{
- sprintf(ret,"%s%s",base,name);
- }
- *namep=ret;
- _status=0;
- abort:
- return(_status);
- }
-
-void nr_errprintf_log(const char *format,...)
- {
- va_list ap;
-
- va_start(ap,format);
-
- r_vlog(nr_util_default_log_facility,LOG_ERR,format,ap);
-
- va_end(ap);
- }
-
-void nr_errprintf_log2(void *ignore, const char *format,...)
- {
- va_list ap;
-
- va_start(ap,format);
-
- r_vlog(nr_util_default_log_facility,LOG_ERR,format,ap);
-
- va_end(ap);
- }
-
-
-int nr_fwrite_all(FILE *fp,UCHAR *buf,int len)
- {
- int r,_status;
-
- while(len){
- r=fwrite(buf,1,len,fp);
- if(r==0)
- ABORT(R_IO_ERROR);
-
- len-=r;
- buf+=r;
- }
-
- _status=0;
- abort:
- return(_status);
- }
-
-int nr_read_data(int fd, char *buf, int len)
- {
- int r,_status;
-
- while(len){
- r=NR_SOCKET_READ(fd,buf,len);
- if(r<=0)
- ABORT(R_EOD);
-
- buf+=r;
- len-=r;
- }
-
-
- _status=0;
- abort:
- return(_status);
- }
-
-#ifdef WIN32
- // TODO
-#else
-int nr_drop_privileges(char *username)
- {
- int _status;
-
- /* Drop privileges */
- if ((getuid() == 0) || geteuid()==0) {
- struct passwd *passwd;
-
- if ((passwd = getpwnam(CAPTURE_USER)) == 0){
- r_log(LOG_GENERIC,LOG_EMERG,"Couldn't get user %s",CAPTURE_USER);
- ABORT(R_INTERNAL);
- }
-
- if(setuid(passwd->pw_uid)!=0){
- r_log(LOG_GENERIC,LOG_EMERG,"Couldn't drop privileges");
- ABORT(R_INTERNAL);
- }
- }
-
- _status=0;
- abort:
- return(_status);
- }
-#endif
-
int nr_bin2hex(UCHAR *in,int len,UCHAR *out)
{
while(len){
@@ -178,174 +70,6 @@ int nr_bin2hex(UCHAR *in,int len,UCHAR *out)
return(0);
}
-int nr_hex_ascii_dump(Data *data)
- {
- UCHAR *ptr=data->data;
- int len=data->len;
-
- while(len){
- int i;
- int bytes=MIN(len,16);
-
- for(i=0;i<bytes;i++)
- printf("%.2x ",ptr[i]&255);
- /* Fill */
- for(i=0;i<(16-bytes);i++)
- printf(" ");
- printf(" ");
-
- for(i=0;i<bytes;i++){
- if(isprint(ptr[i]))
- printf("%c",ptr[i]);
- else
- printf(".");
- }
- printf("\n");
-
- len-=bytes;
- ptr+=bytes;
- }
- return(0);
- }
-
-#ifdef OPENSSL
-int nr_sha1_file(char *filename,UCHAR *out)
- {
- EVP_MD_CTX md_ctx;
- FILE *fp=0;
- int r,_status;
- UCHAR buf[1024];
- int out_len;
-
- EVP_MD_CTX_init(&md_ctx);
-
- if(!(fp=fopen(filename,"r"))){
- r_log(LOG_COMMON,LOG_ERR,"Couldn't open file %s",filename);
- ABORT(R_NOT_FOUND);
- }
-
- EVP_DigestInit_ex(&md_ctx,EVP_sha1(),0);
-
- while(1){
- r=fread(buf,1,sizeof(buf),fp);
-
- if(r<0){
- r_log(LOG_COMMON,LOG_ERR,"Error reading from %s",filename);
- ABORT(R_INTERNAL);
- }
-
- if(!r)
- break;
-
- EVP_DigestUpdate(&md_ctx,buf,r);
- }
-
- EVP_DigestFinal(&md_ctx,out,(unsigned int*)&out_len);
- if(out_len!=20)
- ABORT(R_INTERNAL);
-
- _status=0;
- abort:
- EVP_MD_CTX_cleanup(&md_ctx);
- if(fp) fclose(fp);
-
- return(_status);
- }
-
-#endif
-
-#ifdef WIN32
- // TODO
-#else
-
-int nr_write_pid_file(char *pid_filename)
- {
- FILE *fp;
- int _status;
-
- if(!pid_filename)
- ABORT(R_BAD_ARGS);
-
- unlink(pid_filename);
-
- if(!(fp=fopen(pid_filename,"w"))){
- r_log(LOG_GENERIC,LOG_CRIT,"Couldn't open PID file: %s",strerror(errno));
- ABORT(R_NOT_FOUND);
- }
-
- fprintf(fp,"%d\n",getpid());
-
- fclose(fp);
-
- chmod(pid_filename,S_IRUSR | S_IRGRP | S_IROTH);
-
- _status=0;
- abort:
- return(_status);
- }
-#endif
-
-int nr_reg_uint4_fetch_and_check(NR_registry key, UINT4 min, UINT4 max, int log_fac, int die, UINT4 *val)
- {
- int r,_status;
- UINT4 my_val;
-
- if(r=NR_reg_get_uint4(key,&my_val)){
- r_log(log_fac,LOG_ERR,"Couldn't get key '%s', error %d",key,r);
- ABORT(r);
- }
-
- if((min>0) && (my_val<min)){
- r_log(log_fac,LOG_ERR,"Invalid value for key '%s'=%lu, (min = %lu)",key,(unsigned long)my_val,(unsigned long)min);
- ABORT(R_BAD_DATA);
- }
-
- if(my_val>max){
- r_log(log_fac,LOG_ERR,"Invalid value for key '%s'=%lu, (max = %lu)",key,(unsigned long)my_val,(unsigned long)max);
- ABORT(R_BAD_DATA);
- }
-
- *val=my_val;
- _status=0;
-
- abort:
- if(die && _status){
- r_log(log_fac,LOG_CRIT,"Exiting due to invalid configuration (key '%s')",key);
- exit(1);
- }
- return(_status);
- }
-
-int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_fac, int die, UINT8 *val)
- {
- int r,_status;
- UINT8 my_val;
-
- if(r=NR_reg_get_uint8(key,&my_val)){
- r_log(log_fac,LOG_ERR,"Couldn't get key '%s', error %d",key,r);
- ABORT(r);
- }
-
- if(my_val<min){
- r_log(log_fac,LOG_ERR,"Invalid value for key '%s'=%llu, (min = %llu)",key,my_val,min);
- ABORT(R_BAD_DATA);
- }
-
- if(my_val>max){
- r_log(log_fac,LOG_ERR,"Invalid value for key '%s'=%llu, (max = %llu)",key,my_val,max);
- ABORT(R_BAD_DATA);
- }
-
- *val=my_val;
- _status=0;
-
- abort:
- if(die && _status){
- r_log(log_fac,LOG_CRIT,"Exiting due to invalid configuration (key '%s')",key);
- exit(1);
- }
- return(_status);
- }
#if defined(LINUX) || defined(WIN32)
/*-
diff --git a/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h b/dom/media/webrtc/transport/third_party/nrappkit/src/util/util.h
@@ -42,22 +42,9 @@
#include "registry.h"
-int nr_get_filename(char *base,char *name, char **namep);
-void nr_errprintf_log(const char *fmt,...);
-void nr_errprintf_log2(void *ignore, const char *fmt,...);
extern int nr_util_default_log_facility;
-int nr_read_data(int fd,char *buf,int len);
-int nr_drop_privileges(char *username);
-int nr_hex_ascii_dump(Data *data);
-int nr_fwrite_all(FILE *fp,UCHAR *buf,int len);
-int nr_sha1_file(char *filename,UCHAR *out);
int nr_bin2hex(UCHAR *in,int len,UCHAR *out);
-int nr_rm_tree(char *path);
-int nr_write_pid_file(char *pid_filename);
-
-int nr_reg_uint4_fetch_and_check(NR_registry key, UINT4 min, UINT4 max, int log_fac, int die, UINT4 *val);
-int nr_reg_uint8_fetch_and_check(NR_registry key, UINT8 min, UINT8 max, int log_fac, int die, UINT8 *val);
#endif
