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

diff --git a/src/app/config/config.c b/src/app/config/config.c
index f2db0e5250c379aa00a89186ba684c0b93ac6e6c..27b12f562f616647cb6582b0744fdfa82ef13a83 100644 (file)
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -61,7 +61,7 @@
 #define CONFIG_PRIVATE
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/config/statefile.h"
 #include "app/main/main.h"
 #include "app/main/subsysmgr.h"

diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c
index 834ad93ed7cd67029175f8a293b5f3943144b00d..1d6f63cdeb4aa81d818c7e27025ea1f86406ab1c 100644 (file)
--- a/src/app/config/statefile.c
+++ b/src/app/config/statefile.c
@@ -12,7 +12,7 @@
  *
  * This 'state' file is a typed key-value store that allows multiple
  * 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
  * frequently.  For values that become very large, we typically use a separate
@@ -32,7 +32,7 @@
 #include "core/or/or.h"
 #include "core/or/circuitstats.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/mainloop.h"
 #include "core/mainloop/netstatus.h"
 #include "core/mainloop/connection.h"

diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 1daf468715c12f84892a3b7d0d28349d4f551261..57d929292de0d64dfa96ad19053e5456fad68433 100644 (file)
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -30,7 +30,7 @@
 
 #include "core/or/or.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/onion_crypto.h"
 #include "core/crypto/onion_fast.h"

diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c
index 7a7f3ca600171ac935c4a2051cb8e4761eab3c86..7df2154116f03aeca8fe4bc43f1850e7b1e71ba7 100644 (file)
--- a/src/core/or/circuitstats.c
+++ b/src/core/or/circuitstats.c
@@ -29,7 +29,7 @@
 #include "core/or/circuitbuild.h"
 #include "core/or/circuitstats.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "feature/control/control_events.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "core/mainloop/mainloop.h"

diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 4e61899ecd33d1e889a10ecb5b314e36523f01d7..8af8f14bb06f4e132fd64390bbc8a6962b564b2c 100644 (file)
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -114,7 +114,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/config/statefile.h"
 #include "core/mainloop/connection.h"
 #include "core/mainloop/mainloop.h"

diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
index 68179beef016709f040cdd438b76ff62f923eb0a..e1a8292c9fe98c29e77ed2afa26c872a574c72e6 100644 (file)
--- a/src/feature/control/control_cmd.c
+++ b/src/feature/control/control_cmd.c
@@ -13,7 +13,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/main/main.h"
 #include "core/mainloop/connection.h"
 #include "core/or/circuitbuild.h"
@@ -590,7 +590,7 @@ control_setconf_helper(control_connection_t *conn,
   const unsigned flags =
     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);
 
   opt_err = options_trial_assign(lines, flags, &errstring);

diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c
index 2b9dc0c383ba446d54f8e85aacaf7cb2d8cfd362..ebc595e5173abb22a3f15ea2ec7d656ed2a90588 100644 (file)
--- a/src/feature/dirauth/shared_random.c
+++ b/src/feature/dirauth/shared_random.c
@@ -90,7 +90,7 @@
 #include "core/or/or.h"
 #include "feature/dirauth/shared_random.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_util.h"
 #include "feature/nodelist/networkstatus.h"

diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
index e548eb402811853137fc5b663805dae69cfdf540..759b3b8104e01cafa19a5b13d8e1f4440ba9da9f 100644 (file)
--- a/src/feature/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
@@ -12,7 +12,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "feature/dirauth/dirvote.h"
 #include "feature/nodelist/networkstatus.h"

diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c
index 9a205d39b7695322446e6da2c261f99cd866d555..4f2406d10f5c01f09991eb0038c2b65e3fc01e49 100644 (file)
--- a/src/feature/nodelist/routerset.c
+++ b/src/feature/nodelist/routerset.c
@@ -17,7 +17,7 @@
  *
  * Routersets are typically used for user-specified restrictions, and
  * 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
  * routerstatus_get_all_nodes() / routerstatus_subtract_nodes() to
  * manipulate a smartlist of node_t pointers.

diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h
index dbfd5640794ad9c7eb481937a8184fbd2d163f5d..7e12fe76db994315d175b487fad7bed4d1d25d95 100644 (file)
--- a/src/lib/conf/conftesting.h
+++ b/src/lib/conf/conftesting.h
@@ -17,7 +17,7 @@
 #define USE_CONF_TESTING
 /**
  * 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. */
 typedef union {
   char **STRING;
@@ -47,7 +47,7 @@ typedef union {
 /* Macros to define extra members inside config_var_t fields, and at the
  * 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
  * the address of a static member "tp_dummy.member".   This
  * will give a compiler warning unless the member field is of the correct

diff --git a/src/lib/confmgt/confmgt.c b/src/lib/confmgt/confmgt.c
index ccef40bd2e3d4da2bd49683cbd6daaf52efb99cf..1218a63ae383912c6558c948ee5816413f37c522 100644 (file)
--- a/src/lib/confmgt/confmgt.c
+++ b/src/lib/confmgt/confmgt.c
@@ -21,9 +21,9 @@
  * specified, and a linked list of key-value pairs.
  */
 
-#define CONFPARSE_PRIVATE
+#define CONFMGT_PRIVATE
 #include "orconfig.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 
 #include "lib/confmgt/structvar.h"
 #include "lib/confmgt/unitparse.h"

diff --git a/src/lib/confmgt/confmgt.h b/src/lib/confmgt/confmgt.h
index 246ad887cb1f504957cc95ef155ea50f3eeec30b..f565742c55bfc6e066b999f993d5a94a91b922c5 100644 (file)
--- a/src/lib/confmgt/confmgt.h
+++ b/src/lib/confmgt/confmgt.h
@@ -5,13 +5,13 @@
 /* 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
-#define TOR_CONFPARSE_H
+#ifndef TOR_CONFMGT_H
+#define TOR_CONFMGT_H
 
 #include "lib/conf/conftypes.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_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,
                               const char *key, int use_defaults);
 STATIC void *config_mgr_get_obj_mutable(const config_mgr_t *mgr,
                                         void *toplevel, int idx);
 STATIC const void *config_mgr_get_obj(const config_mgr_t *mgr,
                                        const void *toplevel, int idx);
-#endif /* defined(CONFPARSE_PRIVATE) */
+#endif /* defined(CONFMGT_PRIVATE) */
 
-#endif /* !defined(TOR_CONFPARSE_H) */
+#endif /* !defined(TOR_CONFMGT_H) */

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 7e0802b8101d71425d1c06e8ab4c02e2ea715765..83f3c50ca906ef56025fa91aba5053b76ac28319 100644 (file)
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -16,7 +16,7 @@
 #include "core/or/circuitmux_ewma.h"
 #include "core/or/circuitbuild.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "test/test.h"

diff --git a/src/test/test_confmgr.c b/src/test/test_confmgr.c
index bcacfe953daf9532a8110ad7a8f6f1c0871843bb..375a513c07fed7713af31bacd290811a5a25712f 100644 (file)
--- a/src/test/test_confmgr.c
+++ b/src/test/test_confmgr.c
@@ -4,16 +4,16 @@
 /* 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.
  */
 
-#define CONFPARSE_PRIVATE
+#define CONFMGT_PRIVATE
 #include "orconfig.h"
 
 #include "core/or/or.h"
 #include "lib/encoding/confline.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 

diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c
index 0c12e35f8a1e3d978d7a3821f3ac1ad1129836d0..39e2de866c5f1a9aaa35666d2cda8df6d82e00c7 100644 (file)
--- a/src/test/test_confparse.c
+++ b/src/test/test_confparse.c
@@ -4,17 +4,17 @@
 /* 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.
  */
 
-#define CONFPARSE_PRIVATE
+#define CONFMGT_PRIVATE
 #include "orconfig.h"
 
 #include "core/or/or.h"
 #include "lib/encoding/confline.h"
 #include "feature/nodelist/routerset.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 23fad2e59fdd438fff2209a53d3565baed5befe8..02465b07f04eb8b2ac59995379b1bbb5ac4cff7c 100644 (file)
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -26,7 +26,7 @@
 
 #include "core/or/or.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/connection.h"
 #include "core/or/relay.h"
 #include "core/or/versions.h"

diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c
index 8f2d507743603f914a275b6ee10918f1c39bf41b..c64c1e814a93912822a750c9f9333ecab3fb4614 100644 (file)
--- a/src/test/test_entryconn.c
+++ b/src/test/test_entryconn.c
@@ -11,7 +11,7 @@
 
 #include "feature/client/addressmap.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "core/mainloop/connection.h"
 #include "core/or/connection_edge.h"
 #include "feature/nodelist/nodelist.h"

diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index dec7874c7d189fe04f57c1c3d9f5db32a2f5ad5a..ca699b3cf17135bb50f4ca718b8371ac3b86f409 100644 (file)
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -18,7 +18,7 @@
 #include "core/or/circuitlist.h"
 #include "core/or/circuitbuild.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "feature/dircommon/directory.h"
 #include "feature/dirclient/dirclient.h"

diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c
index 8eb3c2c928801a2755f639b9f54334db8f27397c..29743a0d15aa162f60f462ba5b0364b50bf8fd9f 100644 (file)
--- a/src/test/test_helpers.c
+++ b/src/test/test_helpers.c
@@ -16,7 +16,7 @@
 
 #include "lib/buf/buffers.h"
 #include "app/config/config.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/main/subsysmgr.h"
 #include "core/mainloop/connection.h"
 #include "lib/crypt_ops/crypto_rand.h"

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 268ed575316a8294552d8b7222583f2a5330bc46..ae26cf31b96b382fe8a6a2632a2ee4f4e1f34391 100644 (file)
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -6,7 +6,7 @@
 #define CONFIG_PRIVATE
 #define LOG_PRIVATE
 #include "core/or/or.h"
-#include "lib/confmgt/confparse.h"
+#include "lib/confmgt/confmgt.h"
 #include "app/config/config.h"
 #include "test/test.h"
 #include "lib/geoip/geoip.h"

diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index 8f3ce03c42caa10ae2a29de1f714797cf06fd216..0e391c1baa211bf3250c8b539869d2220b3e655d 100644 (file)
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -11,7 +11,7 @@
 #define PROCESS_PRIVATE
 #include "core/or/or.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_events.h"
 #include "feature/client/transports.h"