mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
Rename confparse.[ch] identifiers to confmgt.[ch] identifiers.
This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ confparse.h confmgt.h \ confparse.c confmgt.c \ CONFPARSE_PRIVATE CONFMGT_PRIVATE \ TOR_CONFPARSE_H TOR_CONFMGT_H
This commit is contained in:
parent
2402d95715
commit
16dffa523e
@ -61,7 +61,7 @@
|
|||||||
#define CONFIG_PRIVATE
|
#define CONFIG_PRIVATE
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "app/config/statefile.h"
|
#include "app/config/statefile.h"
|
||||||
#include "app/main/main.h"
|
#include "app/main/main.h"
|
||||||
#include "app/main/subsysmgr.h"
|
#include "app/main/subsysmgr.h"
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
*
|
*
|
||||||
* This 'state' file is a typed key-value store that allows multiple
|
* This 'state' file is a typed key-value store that allows multiple
|
||||||
* entries for the same key. It follows the same metaformat as described
|
* entries for the same key. It follows the same metaformat as described
|
||||||
* in confparse.c, and uses the same code to read and write itself.
|
* in confmgt.c, and uses the same code to read and write itself.
|
||||||
*
|
*
|
||||||
* The state file is most suitable for small values that don't change too
|
* The state file is most suitable for small values that don't change too
|
||||||
* frequently. For values that become very large, we typically use a separate
|
* frequently. For values that become very large, we typically use a separate
|
||||||
@ -32,7 +32,7 @@
|
|||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "core/or/circuitstats.h"
|
#include "core/or/circuitstats.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "core/mainloop/mainloop.h"
|
#include "core/mainloop/mainloop.h"
|
||||||
#include "core/mainloop/netstatus.h"
|
#include "core/mainloop/netstatus.h"
|
||||||
#include "core/mainloop/connection.h"
|
#include "core/mainloop/connection.h"
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "core/crypto/hs_ntor.h"
|
#include "core/crypto/hs_ntor.h"
|
||||||
#include "core/crypto/onion_crypto.h"
|
#include "core/crypto/onion_crypto.h"
|
||||||
#include "core/crypto/onion_fast.h"
|
#include "core/crypto/onion_fast.h"
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "core/or/circuitbuild.h"
|
#include "core/or/circuitbuild.h"
|
||||||
#include "core/or/circuitstats.h"
|
#include "core/or/circuitstats.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "feature/control/control_events.h"
|
#include "feature/control/control_events.h"
|
||||||
#include "lib/crypt_ops/crypto_rand.h"
|
#include "lib/crypt_ops/crypto_rand.h"
|
||||||
#include "core/mainloop/mainloop.h"
|
#include "core/mainloop/mainloop.h"
|
||||||
|
@ -114,7 +114,7 @@
|
|||||||
|
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "app/config/statefile.h"
|
#include "app/config/statefile.h"
|
||||||
#include "core/mainloop/connection.h"
|
#include "core/mainloop/connection.h"
|
||||||
#include "core/mainloop/mainloop.h"
|
#include "core/mainloop/mainloop.h"
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "app/main/main.h"
|
#include "app/main/main.h"
|
||||||
#include "core/mainloop/connection.h"
|
#include "core/mainloop/connection.h"
|
||||||
#include "core/or/circuitbuild.h"
|
#include "core/or/circuitbuild.h"
|
||||||
@ -590,7 +590,7 @@ control_setconf_helper(control_connection_t *conn,
|
|||||||
const unsigned flags =
|
const unsigned flags =
|
||||||
CAL_CLEAR_FIRST | (use_defaults ? CAL_USE_DEFAULTS : 0);
|
CAL_CLEAR_FIRST | (use_defaults ? CAL_USE_DEFAULTS : 0);
|
||||||
|
|
||||||
// We need a copy here, since confparse.c wants to canonicalize cases.
|
// We need a copy here, since confmgt.c wants to canonicalize cases.
|
||||||
config_line_t *lines = config_lines_dup(args->kwargs);
|
config_line_t *lines = config_lines_dup(args->kwargs);
|
||||||
|
|
||||||
opt_err = options_trial_assign(lines, flags, &errstring);
|
opt_err = options_trial_assign(lines, flags, &errstring);
|
||||||
|
@ -90,7 +90,7 @@
|
|||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "feature/dirauth/shared_random.h"
|
#include "feature/dirauth/shared_random.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "lib/crypt_ops/crypto_rand.h"
|
#include "lib/crypt_ops/crypto_rand.h"
|
||||||
#include "lib/crypt_ops/crypto_util.h"
|
#include "lib/crypt_ops/crypto_util.h"
|
||||||
#include "feature/nodelist/networkstatus.h"
|
#include "feature/nodelist/networkstatus.h"
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "lib/crypt_ops/crypto_util.h"
|
#include "lib/crypt_ops/crypto_util.h"
|
||||||
#include "feature/dirauth/dirvote.h"
|
#include "feature/dirauth/dirvote.h"
|
||||||
#include "feature/nodelist/networkstatus.h"
|
#include "feature/nodelist/networkstatus.h"
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
*
|
*
|
||||||
* Routersets are typically used for user-specified restrictions, and
|
* Routersets are typically used for user-specified restrictions, and
|
||||||
* are created by invoking routerset_new and routerset_parse from
|
* are created by invoking routerset_new and routerset_parse from
|
||||||
* config.c and confparse.c. To use a routerset, invoke one of
|
* config.c and confmgt.c. To use a routerset, invoke one of
|
||||||
* routerset_contains_...() functions , or use
|
* routerset_contains_...() functions , or use
|
||||||
* routerstatus_get_all_nodes() / routerstatus_subtract_nodes() to
|
* routerstatus_get_all_nodes() / routerstatus_subtract_nodes() to
|
||||||
* manipulate a smartlist of node_t pointers.
|
* manipulate a smartlist of node_t pointers.
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#define USE_CONF_TESTING
|
#define USE_CONF_TESTING
|
||||||
/**
|
/**
|
||||||
* Union used when building in test mode typechecking the members of a type
|
* Union used when building in test mode typechecking the members of a type
|
||||||
* used with confparse.c. See CONF_CHECK_VAR_TYPE for a description of how
|
* used with confmgt.c. See CONF_CHECK_VAR_TYPE for a description of how
|
||||||
* it is used. */
|
* it is used. */
|
||||||
typedef union {
|
typedef union {
|
||||||
char **STRING;
|
char **STRING;
|
||||||
@ -47,7 +47,7 @@ typedef union {
|
|||||||
/* Macros to define extra members inside config_var_t fields, and at the
|
/* Macros to define extra members inside config_var_t fields, and at the
|
||||||
* end of a list of them.
|
* end of a list of them.
|
||||||
*/
|
*/
|
||||||
/* This is a somewhat magic type-checking macro for users of confparse.c.
|
/* This is a somewhat magic type-checking macro for users of confmgt.c.
|
||||||
* It initializes a union member "confparse_dummy_values_t.conftype" with
|
* It initializes a union member "confparse_dummy_values_t.conftype" with
|
||||||
* the address of a static member "tp_dummy.member". This
|
* the address of a static member "tp_dummy.member". This
|
||||||
* will give a compiler warning unless the member field is of the correct
|
* will give a compiler warning unless the member field is of the correct
|
||||||
|
@ -21,9 +21,9 @@
|
|||||||
* specified, and a linked list of key-value pairs.
|
* specified, and a linked list of key-value pairs.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFPARSE_PRIVATE
|
#define CONFMGT_PRIVATE
|
||||||
#include "orconfig.h"
|
#include "orconfig.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
|
|
||||||
#include "lib/confmgt/structvar.h"
|
#include "lib/confmgt/structvar.h"
|
||||||
#include "lib/confmgt/unitparse.h"
|
#include "lib/confmgt/unitparse.h"
|
||||||
|
@ -5,13 +5,13 @@
|
|||||||
/* See LICENSE for licensing information */
|
/* See LICENSE for licensing information */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \file confparse.h
|
* \file confmgt.h
|
||||||
*
|
*
|
||||||
* \brief Header for confparse.c.
|
* \brief Header for confmgt.c.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TOR_CONFPARSE_H
|
#ifndef TOR_CONFMGT_H
|
||||||
#define TOR_CONFPARSE_H
|
#define TOR_CONFMGT_H
|
||||||
|
|
||||||
#include "lib/conf/conftypes.h"
|
#include "lib/conf/conftypes.h"
|
||||||
#include "lib/conf/confmacros.h"
|
#include "lib/conf/confmacros.h"
|
||||||
@ -123,13 +123,13 @@ bool config_var_is_listable(const config_var_t *var);
|
|||||||
#define CFG_EQ_LINELIST(a,b,opt) config_lines_eq((a)->opt, (b)->opt)
|
#define CFG_EQ_LINELIST(a,b,opt) config_lines_eq((a)->opt, (b)->opt)
|
||||||
#define CFG_EQ_ROUTERSET(a,b,opt) routerset_equal((a)->opt, (b)->opt)
|
#define CFG_EQ_ROUTERSET(a,b,opt) routerset_equal((a)->opt, (b)->opt)
|
||||||
|
|
||||||
#ifdef CONFPARSE_PRIVATE
|
#ifdef CONFMGT_PRIVATE
|
||||||
STATIC void config_reset_line(const config_mgr_t *mgr, void *options,
|
STATIC void config_reset_line(const config_mgr_t *mgr, void *options,
|
||||||
const char *key, int use_defaults);
|
const char *key, int use_defaults);
|
||||||
STATIC void *config_mgr_get_obj_mutable(const config_mgr_t *mgr,
|
STATIC void *config_mgr_get_obj_mutable(const config_mgr_t *mgr,
|
||||||
void *toplevel, int idx);
|
void *toplevel, int idx);
|
||||||
STATIC const void *config_mgr_get_obj(const config_mgr_t *mgr,
|
STATIC const void *config_mgr_get_obj(const config_mgr_t *mgr,
|
||||||
const void *toplevel, int idx);
|
const void *toplevel, int idx);
|
||||||
#endif /* defined(CONFPARSE_PRIVATE) */
|
#endif /* defined(CONFMGT_PRIVATE) */
|
||||||
|
|
||||||
#endif /* !defined(TOR_CONFPARSE_H) */
|
#endif /* !defined(TOR_CONFMGT_H) */
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include "core/or/circuitmux_ewma.h"
|
#include "core/or/circuitmux_ewma.h"
|
||||||
#include "core/or/circuitbuild.h"
|
#include "core/or/circuitbuild.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "core/mainloop/connection.h"
|
#include "core/mainloop/connection.h"
|
||||||
#include "core/or/connection_edge.h"
|
#include "core/or/connection_edge.h"
|
||||||
#include "test/test.h"
|
#include "test/test.h"
|
||||||
|
@ -4,16 +4,16 @@
|
|||||||
/* See LICENSE for licensing information */
|
/* See LICENSE for licensing information */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tests for confparse.c's features that support multiple configuration
|
* Tests for confmgt.c's features that support multiple configuration
|
||||||
* formats and configuration objects.
|
* formats and configuration objects.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFPARSE_PRIVATE
|
#define CONFMGT_PRIVATE
|
||||||
#include "orconfig.h"
|
#include "orconfig.h"
|
||||||
|
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "lib/encoding/confline.h"
|
#include "lib/encoding/confline.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "test/test.h"
|
#include "test/test.h"
|
||||||
#include "test/log_test_helpers.h"
|
#include "test/log_test_helpers.h"
|
||||||
|
|
||||||
|
@ -4,17 +4,17 @@
|
|||||||
/* See LICENSE for licensing information */
|
/* See LICENSE for licensing information */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tests for confparse.c module that we use to parse various
|
* Tests for confmgt.c module that we use to parse various
|
||||||
* configuration/state file types.
|
* configuration/state file types.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define CONFPARSE_PRIVATE
|
#define CONFMGT_PRIVATE
|
||||||
#include "orconfig.h"
|
#include "orconfig.h"
|
||||||
|
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "lib/encoding/confline.h"
|
#include "lib/encoding/confline.h"
|
||||||
#include "feature/nodelist/routerset.h"
|
#include "feature/nodelist/routerset.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "test/test.h"
|
#include "test/test.h"
|
||||||
#include "test/log_test_helpers.h"
|
#include "test/log_test_helpers.h"
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "core/mainloop/connection.h"
|
#include "core/mainloop/connection.h"
|
||||||
#include "core/or/relay.h"
|
#include "core/or/relay.h"
|
||||||
#include "core/or/versions.h"
|
#include "core/or/versions.h"
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include "feature/client/addressmap.h"
|
#include "feature/client/addressmap.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "core/mainloop/connection.h"
|
#include "core/mainloop/connection.h"
|
||||||
#include "core/or/connection_edge.h"
|
#include "core/or/connection_edge.h"
|
||||||
#include "feature/nodelist/nodelist.h"
|
#include "feature/nodelist/nodelist.h"
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "core/or/circuitlist.h"
|
#include "core/or/circuitlist.h"
|
||||||
#include "core/or/circuitbuild.h"
|
#include "core/or/circuitbuild.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "lib/crypt_ops/crypto_rand.h"
|
#include "lib/crypt_ops/crypto_rand.h"
|
||||||
#include "feature/dircommon/directory.h"
|
#include "feature/dircommon/directory.h"
|
||||||
#include "feature/dirclient/dirclient.h"
|
#include "feature/dirclient/dirclient.h"
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#include "lib/buf/buffers.h"
|
#include "lib/buf/buffers.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "app/main/subsysmgr.h"
|
#include "app/main/subsysmgr.h"
|
||||||
#include "core/mainloop/connection.h"
|
#include "core/mainloop/connection.h"
|
||||||
#include "lib/crypt_ops/crypto_rand.h"
|
#include "lib/crypt_ops/crypto_rand.h"
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#define CONFIG_PRIVATE
|
#define CONFIG_PRIVATE
|
||||||
#define LOG_PRIVATE
|
#define LOG_PRIVATE
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "test/test.h"
|
#include "test/test.h"
|
||||||
#include "lib/geoip/geoip.h"
|
#include "lib/geoip/geoip.h"
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
#define PROCESS_PRIVATE
|
#define PROCESS_PRIVATE
|
||||||
#include "core/or/or.h"
|
#include "core/or/or.h"
|
||||||
#include "app/config/config.h"
|
#include "app/config/config.h"
|
||||||
#include "lib/confmgt/confparse.h"
|
#include "lib/confmgt/confmgt.h"
|
||||||
#include "feature/control/control.h"
|
#include "feature/control/control.h"
|
||||||
#include "feature/control/control_events.h"
|
#include "feature/control/control_events.h"
|
||||||
#include "feature/client/transports.h"
|
#include "feature/client/transports.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user