tor-commits September 2019

tor-commits@lists.torproject.org

21 participants
2044 discussions

[tor/master] typedvar: remove now-unused functions taking config_type_t.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 161c392a4fbd85e2c67ae977cc6b46840a51151d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 14:54:59 2019 -0400 typedvar: remove now-unused functions taking config_type_t. These functions are no longer used. Part of 31629. --- src/lib/confmgt/typedvar.c | 96 ---------------------------------------------- src/lib/confmgt/typedvar.h | 13 ------- 2 files changed, 109 deletions(-) diff --git a/src/lib/confmgt/typedvar.c b/src/lib/confmgt/typedvar.c index 3cba07539..1a1dcf73d 100644 --- a/src/lib/confmgt/typedvar.c +++ b/src/lib/confmgt/typedvar.c @@ -254,99 +254,3 @@ var_type_is_settable(const var_type_def_t *def) { return ! def->is_unsettable; } - -/* ===== - * The functions below take a config_type_t instead of a var_type_def_t. - * I'd like to deprecate them eventually and use var_type_def_t everywhere, - * but for now they make migration easier. - * ===== */ - -/** - * As typed_var_assign_ex(), but look up the definition of the configuration - * type from a provided config_type_t enum. - */ -int -typed_var_assign(void *target, const char *value, char **errmsg, - config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_assign_ex(target, value, errmsg, def); -} - -/** - * As typed_var_kvassign_ex(), but look up the definition of the configuration - * type from a provided config_type_t enum. - */ -int -typed_var_kvassign(void *target, const config_line_t *line, char **errmsg, - config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_kvassign_ex(target, line, errmsg, def); -} - -/** - * As typed_var_free_ex(), but look up the definition of the configuration - * type from a provided config_type_t enum. - */ -void -typed_var_free(void *target, config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_free_ex(target, def); -} - -/** - * As typed_var_encode_ex(), but look up the definition of the configuration - * type from a provided config_type_t enum. - */ -char * -typed_var_encode(const void *value, config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_encode_ex(value, def); -} - -/** - * As typed_var_kvencode_ex(), but look up the definition of the configuration - * type from a provided config_type_t enum. - */ -config_line_t * -typed_var_kvencode(const char *key, const void *value, config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_kvencode_ex(key, value, def); -} - -/** - * As typed_var_copy_ex(), but look up the definition of the configuration type - * from a provided config_type_t enum. - */ -int -typed_var_copy(void *dest, const void *src, config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_copy_ex(dest, src, def); -} - -/** - * As typed_var_eq_ex(), but look up the definition of the configuration type - * from a provided config_type_t enum. - */ -bool -typed_var_eq(const void *a, const void *b, config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_eq_ex(a, b, def); -} - -/** - * As typed_var_ok_ex(), but look up the definition of the configuration type - * from a provided config_type_t enum. - */ -bool -typed_var_ok(const void *value, config_type_t type) -{ - const var_type_def_t *def = lookup_type_def(type); - return typed_var_ok_ex(value, def); -} diff --git a/src/lib/confmgt/typedvar.h b/src/lib/confmgt/typedvar.h index 2e36f9d67..e1ede6f95 100644 --- a/src/lib/confmgt/typedvar.h +++ b/src/lib/confmgt/typedvar.h @@ -20,19 +20,6 @@ struct config_line_t; typedef struct var_type_fns_t var_type_fns_t; typedef struct var_type_def_t var_type_def_t; -int typed_var_assign(void *target, const char *value, char **errmsg, - enum config_type_t type); -void typed_var_free(void *target, enum config_type_t type); -char *typed_var_encode(const void *value, enum config_type_t type); -int typed_var_copy(void *dest, const void *src, enum config_type_t type); -bool typed_var_eq(const void *a, const void *b, enum config_type_t type); -bool typed_var_ok(const void *value, enum config_type_t type); - -int typed_var_kvassign(void *target, const struct config_line_t *line, - char **errmsg, enum config_type_t type); -struct config_line_t *typed_var_kvencode(const char *key, const void *value, - enum config_type_t type); - int typed_var_assign_ex(void *target, const char *value, char **errmsg, const var_type_def_t *def); void typed_var_free_ex(void *target, const var_type_def_t *def);

1 0

[tor/master] Remove _ex suffix from typed_var_*_ex() functions.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 88839ab2ac489af7b80c2812fc87ab8b89075fbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 14:58:56 2019 -0400 Remove _ex suffix from typed_var_*_ex() functions. Now that the variants of these functions that took config_line_t are gone, there is no longer any reason for the remaining variants to have "ex" at the end of their names. This commit was made by running this perl script over all the files in src/: #!/usr/bin/perl -w -i -p s{typed_var_(assign|free|encode|copy|eq|ok|kvassign|kvencode|mark_fragile)_ex} {typed_var_$1}g; --- src/lib/confmgt/structvar.c | 18 +++++++++--------- src/lib/confmgt/typedvar.c | 38 +++++++++++++++++++------------------- src/lib/confmgt/typedvar.h | 18 +++++++++--------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index 97a8fb363..32f616c21 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -103,7 +103,7 @@ struct_var_assign(void *object, const char *value, char **errmsg, void *p = struct_get_mptr(object, member); const var_type_def_t *def = get_type_def(member); - return typed_var_assign_ex(p, value, errmsg, def); + return typed_var_assign(p, value, errmsg, def); } /** @@ -116,7 +116,7 @@ struct_var_free(void *object, const struct_member_t *member) void *p = struct_get_mptr(object, member); const var_type_def_t *def = get_type_def(member); - typed_var_free_ex(p, def); + typed_var_free(p, def); } /** @@ -129,7 +129,7 @@ struct_var_encode(const void *object, const struct_member_t *member) const void *p = struct_get_ptr(object, member); const var_type_def_t *def = get_type_def(member); - return typed_var_encode_ex(p, def); + return typed_var_encode(p, def); } /** @@ -143,7 +143,7 @@ struct_var_copy(void *dest, const void *src, const struct_member_t *member) const void *p_src = struct_get_ptr(src, member); const var_type_def_t *def = get_type_def(member); - return typed_var_copy_ex(p_dest, p_src, def); + return typed_var_copy(p_dest, p_src, def); } /** @@ -157,7 +157,7 @@ struct_var_eq(const void *a, const void *b, const struct_member_t *member) const void *p_b = struct_get_ptr(b, member); const var_type_def_t *def = get_type_def(member); - return typed_var_eq_ex(p_a, p_b, def); + return typed_var_eq(p_a, p_b, def); } /** @@ -170,7 +170,7 @@ struct_var_ok(const void *object, const struct_member_t *member) const void *p = struct_get_ptr(object, member); const var_type_def_t *def = get_type_def(member); - return typed_var_ok_ex(p, def); + return typed_var_ok(p, def); } /** @@ -185,7 +185,7 @@ struct_var_kvassign(void *object, const struct config_line_t *line, void *p = struct_get_mptr(object, member); const var_type_def_t *def = get_type_def(member); - return typed_var_kvassign_ex(p, line, errmsg, def); + return typed_var_kvassign(p, line, errmsg, def); } /** @@ -198,7 +198,7 @@ struct_var_kvencode(const void *object, const struct_member_t *member) const void *p = struct_get_ptr(object, member); const var_type_def_t *def = get_type_def(member); - return typed_var_kvencode_ex(member->name, p, def); + return typed_var_kvencode(member->name, p, def); } /** @@ -211,7 +211,7 @@ struct_var_mark_fragile(void *object, const struct_member_t *member) { void *p = struct_get_mptr(object, member); const var_type_def_t *def = get_type_def(member); - return typed_var_mark_fragile_ex(p, def); + return typed_var_mark_fragile(p, def); } /** diff --git a/src/lib/confmgt/typedvar.c b/src/lib/confmgt/typedvar.c index 1a1dcf73d..43040e1e0 100644 --- a/src/lib/confmgt/typedvar.c +++ b/src/lib/confmgt/typedvar.c @@ -40,13 +40,13 @@ * string holding an error message, and return -1. **/ int -typed_var_assign_ex(void *target, const char *value, char **errmsg, +typed_var_assign(void *target, const char *value, char **errmsg, const var_type_def_t *def) { if (BUG(!def)) return -1; // LCOV_EXCL_LINE // clear old value if needed. - typed_var_free_ex(target, def); + typed_var_free(target, def); tor_assert(def->fns->parse); return def->fns->parse(target, value, errmsg, def->params); @@ -55,7 +55,7 @@ typed_var_assign_ex(void *target, const char *value, char **errmsg, /** * Try to parse a single line from the head ofline that encodes an * object of the type defined in def. On success and failure, behave as - * typed_var_assign_ex(). + * typed_var_assign(). * * All types for which keys are significant should use this function. * @@ -63,7 +63,7 @@ typed_var_assign_ex(void *target, const char *value, char **errmsg, * only the first one is handled by this function. **/ int -typed_var_kvassign_ex(void *target, const config_line_t *line, +typed_var_kvassign(void *target, const config_line_t *line, char **errmsg, const var_type_def_t *def) { if (BUG(!def)) @@ -75,7 +75,7 @@ typed_var_kvassign_ex(void *target, const config_line_t *line, return def->fns->kv_parse(target, line, errmsg, def->params); } - return typed_var_assign_ex(target, line->value, errmsg, def); + return typed_var_assign(target, line->value, errmsg, def); } /** @@ -83,7 +83,7 @@ typed_var_kvassign_ex(void *target, const config_line_t *line, * def, and set target to a reasonable default. **/ void -typed_var_free_ex(void *target, const var_type_def_t *def) +typed_var_free(void *target, const var_type_def_t *def) { if (BUG(!def)) return; // LCOV_EXCL_LINE @@ -99,7 +99,7 @@ typed_var_free_ex(void *target, const var_type_def_t *def) * Returns NULL if this option has a NULL value, or on internal error. **/ char * -typed_var_encode_ex(const void *value, const var_type_def_t *def) +typed_var_encode(const void *value, const var_type_def_t *def) { if (BUG(!def)) return NULL; // LCOV_EXCL_LINE @@ -108,7 +108,7 @@ typed_var_encode_ex(const void *value, const var_type_def_t *def) } /** - * As typed_var_encode_ex(), but returns a newly allocated config_line_t + * As typed_var_encode(), but returns a newly allocated config_line_t * object. The provided key is used as the key of the lines, unless * the type is one (line a linelist) that encodes its own keys. * @@ -117,7 +117,7 @@ typed_var_encode_ex(const void *value, const var_type_def_t *def) * Returns NULL if there are no lines to encode, or on internal error. */ config_line_t * -typed_var_kvencode_ex(const char *key, const void *value, +typed_var_kvencode(const char *key, const void *value, const var_type_def_t *def) { if (BUG(!def)) @@ -125,7 +125,7 @@ typed_var_kvencode_ex(const char *key, const void *value, if (def->fns->kv_encode) { return def->fns->kv_encode(key, value, def->params); } - char *encoded_value = typed_var_encode_ex(value, def); + char *encoded_value = typed_var_encode(value, def); if (!encoded_value) return NULL; @@ -142,7 +142,7 @@ typed_var_kvencode_ex(const char *key, const void *value, * Return 0 on success, and -1 on failure. **/ int -typed_var_copy_ex(void *dest, const void *src, const var_type_def_t *def) +typed_var_copy(void *dest, const void *src, const var_type_def_t *def) { if (BUG(!def)) return -1; // LCOV_EXCL_LINE @@ -152,13 +152,13 @@ typed_var_copy_ex(void *dest, const void *src, const var_type_def_t *def) } // Otherwise, encode 'src' and parse the result into 'def'. - char *enc = typed_var_encode_ex(src, def); + char *enc = typed_var_encode(src, def); if (!enc) { - typed_var_free_ex(dest, def); + typed_var_free(dest, def); return 0; } char *err = NULL; - int rv = typed_var_assign_ex(dest, enc, &err, def); + int rv = typed_var_assign(dest, enc, &err, def); if (BUG(rv < 0)) { // LCOV_EXCL_START log_warn(LD_BUG, "Encoded value %s was not parseable as a %s: %s", @@ -175,7 +175,7 @@ typed_var_copy_ex(void *dest, const void *src, const var_type_def_t *def) * Both types must be as defined by def. **/ bool -typed_var_eq_ex(const void *a, const void *b, const var_type_def_t *def) +typed_var_eq(const void *a, const void *b, const var_type_def_t *def) { if (BUG(!def)) return false; // LCOV_EXCL_LINE @@ -186,8 +186,8 @@ typed_var_eq_ex(const void *a, const void *b, const var_type_def_t *def) } // Otherwise, encode the values and compare them. - char *enc_a = typed_var_encode_ex(a, def); - char *enc_b = typed_var_encode_ex(b, def); + char *enc_a = typed_var_encode(a, def); + char *enc_b = typed_var_encode(b, def); bool eq = !strcmp_opt(enc_a,enc_b); tor_free(enc_a); tor_free(enc_b); @@ -199,7 +199,7 @@ typed_var_eq_ex(const void *a, const void *b, const var_type_def_t *def) * type definition in def. */ bool -typed_var_ok_ex(const void *value, const var_type_def_t *def) +typed_var_ok(const void *value, const var_type_def_t *def) { if (BUG(!def)) return false; // LCOV_EXCL_LINE @@ -216,7 +216,7 @@ typed_var_ok_ex(const void *value, const var_type_def_t *def) * assignment instead. **/ void -typed_var_mark_fragile_ex(void *value, const var_type_def_t *def) +typed_var_mark_fragile(void *value, const var_type_def_t *def) { if (BUG(!def)) { return; // LCOV_EXCL_LINE diff --git a/src/lib/confmgt/typedvar.h b/src/lib/confmgt/typedvar.h index e1ede6f95..23fd8c13e 100644 --- a/src/lib/confmgt/typedvar.h +++ b/src/lib/confmgt/typedvar.h @@ -20,20 +20,20 @@ struct config_line_t; typedef struct var_type_fns_t var_type_fns_t; typedef struct var_type_def_t var_type_def_t; -int typed_var_assign_ex(void *target, const char *value, char **errmsg, +int typed_var_assign(void *target, const char *value, char **errmsg, const var_type_def_t *def); -void typed_var_free_ex(void *target, const var_type_def_t *def); -char *typed_var_encode_ex(const void *value, const var_type_def_t *def); -int typed_var_copy_ex(void *dest, const void *src, const var_type_def_t *def); -bool typed_var_eq_ex(const void *a, const void *b, const var_type_def_t *def); -bool typed_var_ok_ex(const void *value, const var_type_def_t *def); +void typed_var_free(void *target, const var_type_def_t *def); +char *typed_var_encode(const void *value, const var_type_def_t *def); +int typed_var_copy(void *dest, const void *src, const var_type_def_t *def); +bool typed_var_eq(const void *a, const void *b, const var_type_def_t *def); +bool typed_var_ok(const void *value, const var_type_def_t *def); -int typed_var_kvassign_ex(void *target, const struct config_line_t *line, +int typed_var_kvassign(void *target, const struct config_line_t *line, char **errmsg, const var_type_def_t *def); -struct config_line_t *typed_var_kvencode_ex(const char *key, const void *value, +struct config_line_t *typed_var_kvencode(const char *key, const void *value, const var_type_def_t *def); -void typed_var_mark_fragile_ex(void *value, const var_type_def_t *def); +void typed_var_mark_fragile(void *value, const var_type_def_t *def); bool var_type_is_cumulative(const var_type_def_t *def); bool var_type_is_contained(const var_type_def_t *def);

1 0

[tor/master] Merge branch 'tor-github/pr/1295'
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 545c21e23dcb2c73ab9d9f33e2ea6906a230b4b5 Merge: ddd01541b 88839ab2a Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 5 17:13:29 2019 +0300 Merge branch 'tor-github/pr/1295' src/lib/confmgt/structvar.c | 18 +++--- src/lib/confmgt/typedvar.c | 134 +++++++------------------------------------- src/lib/confmgt/typedvar.h | 29 +++------- 3 files changed, 36 insertions(+), 145 deletions(-)

1 0

[tor/master] config_assign: Document CAL_* options.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit aeda598fd5935331e96975b91eb91bce21096f9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 13:48:16 2019 -0400 config_assign: Document CAL_* options. These were sort of described in config_assign() documentation, but not so well. --- src/app/config/confparse.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index d628db503..405200d69 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -113,8 +113,28 @@ struct smartlist_t *config_mgr_list_deprecated_vars(const config_mgr_t *mgr); /** A collection of managed configuration objects. */ typedef struct config_suite_t config_suite_t; +/** + * Flag for config_assign: if set, then "resetting" an option changes it to + * its default value, as specified in the config_var_t. Otherwise, + * "resetting" an option changes it to a type-dependent null value -- + * typically 0 or NULL. + * + * (An option is "reset" when it is set to an empty value, or as described in + * CAL_CLEAR_FIRST). + **/ #define CAL_USE_DEFAULTS (1u<<0) +/** + * Flag for config_assign: if set, then we reset every provided config + * option before we set it. + * + * For example, if this flag is not set, then passing a multi-line option to + * config_assign will cause any previous value to be extended. But if this + * flag is set, then a multi-line option will replace any previous value. + **/ #define CAL_CLEAR_FIRST (1u<<1) +/** + * Flag for config_assign: if set, we warn about deprecated options. + **/ #define CAL_WARN_DEPRECATIONS (1u<<2) void *config_new(const config_mgr_t *fmt);

1 0

[tor/master] Document return value of config_mgr_add_format().
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 39316da9b643583f52c1ff30bca7a07ea04cdba3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 14:01:32 2019 -0400 Document return value of config_mgr_add_format(). --- src/app/config/confparse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index f20a361ba..23a89ba62 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -203,6 +203,9 @@ config_mgr_register_fmt(config_mgr_t *mgr, /** * Add a new format to this configuration object. Asserts on failure. * + * Returns an internal "index" value used to identify this format within + * all of those formats contained in mgr. This index value + * should not generally be used outside of this module. **/ int config_mgr_add_format(config_mgr_t *mgr,

1 0

[tor/master] Document configuration and abbreviation types.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 577ea20b3a34ed61bc7a005e4105c63abad85d41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 13:41:53 2019 -0400 Document configuration and abbreviation types. --- src/app/config/confparse.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index b788e2cd1..d628db503 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -17,21 +17,38 @@ #include "lib/conf/confmacros.h" #include "lib/testsupport/testsupport.h" -/** An abbreviation for a configuration option allowed on the command line. */ +/** + * An abbreviation or alias for a configuration option. + **/ typedef struct config_abbrev_t { + /** The option name as abbreviated. Not case-sensitive. */ const char *abbreviated; + /** The full name of the option. Not case-sensitive. */ const char *full; + /** True if this abbreviation should only be allowed on the command line. */ int commandline_only; + /** True if we should warn whenever this abbreviation is used. */ int warn; } config_abbrev_t; +/** + * A note that a configuration option is deprecated, with an explanation why. + */ typedef struct config_deprecation_t { + /** The option that is deprecated. */ const char *name; + /** A user-facing string explaining why the option is deprecated. */ const char *why_deprecated; } config_deprecation_t; -/* Handy macro for declaring "In the config file or on the command line, - * you can abbreviate toks as tok". */ +/** + * Handy macro for declaring "In the config file or on the command line, you + * can abbreviate toks as tok". Used inside an array of + * config_abbrev_t. + * + * For example, to declare "NumCpu" as an abbreviation for "NumCPUs", + * you can say PLURAL(NumCpu). + **/ #define PLURAL(tok) { #tok, #tok "s", 0, 0 } /** Type of a callback to validate whether a given configuration is

1 0

[tor/master] Document validate_fn_t as it stands.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 39dd2e2aa826930bfe681d99c3e8374757ac511b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 13:54:26 2019 -0400 Document validate_fn_t as it stands. Also document that it will be changed in a later branch. --- src/app/config/confparse.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 405200d69..baf60f07c 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -51,10 +51,28 @@ typedef struct config_deprecation_t { **/ #define PLURAL(tok) { #tok, #tok "s", 0, 0 } -/** Type of a callback to validate whether a given configuration is - * well-formed and consistent. See options_trial_assign() for documentation - * of arguments. */ -typedef int (*validate_fn_t)(void*,void*,void*,int,char**); +/** + * Type of a callback to validate whether a given configuration is + * well-formed and consistent. + * + * The configuration to validate is passed as newval. The previous + * configuration, if any, is provided in oldval. The + * default_val argument receives a configuration object initialized + * with default values for all its fields. The from_setconf argument + * is true iff the input comes from a SETCONF controller command. + * + * On success, return 0. On failure, set *msg_out to a newly allocated + * error message, and return -1. + * + * REFACTORING NOTE: Currently, this callback type is only used from inside + * config_dump(); later in our refactoring, it will be cleaned up and used + * more generally. + */ +typedef int (*validate_fn_t)(void *oldval, + void *newval, + void *default_val, + int from_setconf, + char **msg_out); struct config_mgr_t;

1 0

[tor/master] Document warn_deprecated_option().
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 3db56aeeb8a59629690a05cd43565764a254d1e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 14:01:43 2019 -0400 Document warn_deprecated_option(). --- src/app/config/confparse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 23a89ba62..b0ff4daa8 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -578,6 +578,10 @@ config_mark_lists_fragile(const config_mgr_t *mgr, void *options) } SMARTLIST_FOREACH_END(mv); } +/** + * Log a warning that declaring that the option called what + * is deprecated because of the reason in why. + **/ void warn_deprecated_option(const char *what, const char *why) {

1 0

[tor/master] Document fields of struct_magic_decl_t.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit b3c28677159c26070f26909b3f4c2e00e50d7bff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 14:03:38 2019 -0400 Document fields of struct_magic_decl_t. --- src/lib/conf/conftypes.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index fabad97d0..3db115204 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -100,8 +100,12 @@ typedef struct struct_member_t { * that they have the correct type. */ typedef struct struct_magic_decl_t { + /** The name of the structure */ const char *typename; + /** A value used to recognize instances of this structure. */ uint32_t magic_val; + /** The location within the structure at which we expect to find + * magic_val. */ int magic_offset; } struct_magic_decl_t;

1 0

[tor/master] config: note that some arguments are required.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit eb909c4e433087b466e78d33af8eed47adcabf16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 07:57:36 2019 -0400 config: note that some arguments are required. --- src/app/config/confparse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index b0ff4daa8..054d2addb 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -581,6 +581,8 @@ config_mark_lists_fragile(const config_mgr_t *mgr, void *options) /** * Log a warning that declaring that the option called what * is deprecated because of the reason in why. + * + * (Both arguments must be non-NULL.) **/ void warn_deprecated_option(const char *what, const char *why)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2019