From a727d4a3a17674e886f2b3fd6344774a2d759743 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 5 Sep 2019 15:24:54 -0400 Subject: [PATCH] Remove unused struct_var_* functions. These turned out to be unnecessary, so let's not keep them around and let them start getting complicated. Closes ticket 31630. --- src/lib/confmgt/structvar.c | 27 --------------------------- src/lib/confmgt/structvar.h | 4 ---- 2 files changed, 31 deletions(-) diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index 32f616c214..75edda2c38 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -92,20 +92,6 @@ get_type_def(const struct_member_t *member) return lookup_type_def(member->type); } -/** - * (As typed_var_assign, but assign a value to the member of object - * defined by member.) - **/ -int -struct_var_assign(void *object, const char *value, char **errmsg, - 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_assign(p, value, errmsg, def); -} - /** * (As typed_var_free, but free and clear the member of object defined * by member.) @@ -119,19 +105,6 @@ struct_var_free(void *object, const struct_member_t *member) typed_var_free(p, def); } -/** - * (As typed_var_encode, but encode the member of object defined - * by member.) - **/ -char * -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(p, def); -} - /** * (As typed_var_copy, but copy from src to dest the member * defined by member.) diff --git a/src/lib/confmgt/structvar.h b/src/lib/confmgt/structvar.h index e6dbc6d6ec..9783d1ec27 100644 --- a/src/lib/confmgt/structvar.h +++ b/src/lib/confmgt/structvar.h @@ -28,12 +28,8 @@ void *struct_get_mptr(void *object, const void *struct_get_ptr(const void *object, const struct struct_member_t *member); -int struct_var_assign(void *object, const char *value, char **errmsg, - const struct struct_member_t *member); void struct_var_free(void *object, const struct struct_member_t *member); -char *struct_var_encode(const void *object, - const struct struct_member_t *member); int struct_var_copy(void *dest, const void *src, const struct struct_member_t *member); bool struct_var_eq(const void *a, const void *b,