remove unused wrappers

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index 8e3d3a2698922371ce96a8848e28a6fa3c6cb570..77f5f5484dd09e2c2f31cb4c39739eb33ab35532 100644 (file)
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -26,16 +26,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/struct.h>
 #include <freeradius-devel/util/proto.h>
 
-/*
- *     Context wrapper to let us, pro tempore, support both dbuff and ptr/len flavored
- *     struct-to-network encoding without code replication.
- */
-
-typedef struct {
-     void              *ectx;
-     fr_encode_value_t encoder;
-} encode_ctx_wrapper;
-
 fr_pair_t *fr_raw_from_network(TALLOC_CTX *ctx, fr_dict_attr_t const *parent, uint8_t const *data, size_t data_len)
 {
        fr_pair_t *vp;
@@ -360,29 +350,6 @@ done:
        return data_len;
 }
 
-static ssize_t wrapped_encoder(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth,
-                                          fr_cursor_t *cursor, void *encoder_ctx)
-{
-       encode_ctx_wrapper      *wrapper = (encode_ctx_wrapper *) encoder_ctx;
-       ssize_t                 slen;
-
-       slen = wrapper->encoder(dbuff->p, fr_dbuff_remaining(dbuff), da_stack, depth, cursor, wrapper->ectx);
-       if (slen < 0) return slen;
-       return fr_dbuff_advance(dbuff, slen);
-}
-
-ssize_t fr_struct_to_network(uint8_t *out, size_t outlen, fr_da_stack_t *da_stack, unsigned int depth,
-                            fr_cursor_t *cursor, void *encoder_ctx,
-                            fr_encode_value_t encode_value)
-{
-       fr_dbuff_t              dbuff = FR_DBUFF_TMP(out, outlen);
-       encode_ctx_wrapper      wrapper = {.ectx = encoder_ctx, .encoder = encode_value};
-
-       if (encode_value == NULL) return fr_struct_to_network_dbuff(&dbuff, da_stack, depth, cursor, NULL, NULL);
-
-       return fr_struct_to_network_dbuff(&FR_DBUFF_TMP(out, outlen), da_stack, depth,
-                                         cursor, (void *) &wrapper, wrapped_encoder);
-}
 
 /** Put bits into an output dbuff
  *

diff --git a/src/lib/util/struct.h b/src/lib/util/struct.h
index b49a5d79b834a2df4818c25bfc7d2cbf0a7fba28..e3ba20354556dfc9f1228aa591ace014d197b32b 100644 (file)
--- a/src/lib/util/struct.h
+++ b/src/lib/util/struct.h
@@ -41,13 +41,6 @@ ssize_t fr_struct_from_network(TALLOC_CTX *ctx, fr_cursor_t *cursor,
                               fr_dict_attr_t const **child,
                               fr_decode_value_t decode_value, void *decoder_ctx) CC_HINT(nonnull(2,3,4));
 
-typedef ssize_t (*fr_encode_value_t)(uint8_t *out, size_t outlen, fr_da_stack_t *da_stack, unsigned int depth,
-                                    fr_cursor_t *cursor, void *encoder_ctx);
-
-ssize_t fr_struct_to_network(uint8_t *out, size_t outlen, fr_da_stack_t *da_stack, unsigned int depth,
-                            fr_cursor_t *cursor, void *encoder_ctx,
-                            fr_encode_value_t encode_value) CC_HINT(nonnull(1,3,5));
-
 typedef ssize_t (*fr_encode_value_dbuff_t)(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth,
                                           fr_cursor_t *cursor, void *encoder_ctx);