commit 161c392a4fbd85e2c67ae977cc6b46840a51151d Author: Nick Mathewson nickm@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);