rearrange and remove unused code

diff --git a/src/protocols/tftp/decode.c b/src/protocols/tftp/decode.c
index 2bd245b5d1fdb604d072914049ab77f212dd3900..5987bb6aa8d84ef6730e86ecb0addd5467974d15 100644 (file)
--- a/src/protocols/tftp/decode.c
+++ b/src/protocols/tftp/decode.c
@@ -273,7 +273,7 @@ done:
  *     Used as the decoder ctx.
  */
 typedef struct {
-       fr_dict_attr_t const *root;
+       int             nothing;
 } fr_tftp_ctx_t;
 
 /*
@@ -301,7 +301,6 @@ static int decode_test_ctx(void **out, TALLOC_CTX *ctx)
        test_ctx = talloc_zero(ctx, fr_tftp_ctx_t);
        if (!test_ctx) return -1;
 
-       test_ctx->root = fr_dict_root(dict_tftp);
        talloc_set_destructor(test_ctx, _decode_test_ctx);
 
        *out = test_ctx;

diff --git a/src/protocols/tftp/encode.c b/src/protocols/tftp/encode.c
index c8849d8d1b430af54be76844acb37cc81cdc792c..ee9b7a9a529ff859b3330aaf479ef1ae311b5cea 100644 (file)
--- a/src/protocols/tftp/encode.c
+++ b/src/protocols/tftp/encode.c
@@ -237,7 +237,7 @@ done:
  *     Used as the encoder ctx.
  */
 typedef struct {
-       fr_dict_attr_t const *root;
+       int             nothing;
 } fr_tftp_ctx_t;
 /*
  *     Test points for protocol encode
@@ -263,7 +263,6 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
        test_ctx = talloc_zero(ctx, fr_tftp_ctx_t);
        if (!test_ctx) return -1;
 
-       test_ctx->root = fr_dict_root(dict_tftp);
        talloc_set_destructor(test_ctx, _encode_test_ctx);
 
        *out = test_ctx;

diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c
index 1dc36c5cf79a8b86698c408412eef3d2b627d2b4..4a6806e2e478bc6cf292018d30f0a4f923dd2a26 100644 (file)
--- a/src/protocols/vmps/vmps.c
+++ b/src/protocols/vmps/vmps.c
@@ -33,6 +33,13 @@ RCSID("$Id$")
 #include "vmps.h"
 #include "attrs.h"
 
+/** Used as the decoder ctx
+ *
+ */
+typedef struct {
+       int             nothing;
+} fr_vmps_ctx_t;
+
 /*
  *  http://www.openbsd.org/cgi-bin/cvsweb/src/usr.sbin/tcpdump/print-vqp.c
  *
@@ -558,7 +565,6 @@ static int decode_test_ctx(void **out, TALLOC_CTX *ctx)
        test_ctx = talloc_zero(ctx, fr_vmps_ctx_t);
        if (!test_ctx) return -1;
 
-       test_ctx->root = fr_dict_root(dict_vmps);
        talloc_set_destructor(test_ctx, _decode_test_ctx);
 
        *out = test_ctx;
@@ -600,7 +606,6 @@ static int encode_test_ctx(void **out, TALLOC_CTX *ctx)
        test_ctx = talloc_zero(ctx, fr_vmps_ctx_t);
        if (!test_ctx) return -1;
 
-       test_ctx->root = fr_dict_root(dict_vmps);
        talloc_set_destructor(test_ctx, _encode_test_ctx);
 
        *out = test_ctx;

diff --git a/src/protocols/vmps/vmps.h b/src/protocols/vmps/vmps.h
index 9628dd1e8cb6b9d69bce2dbf6a9a1ef5b1efa056..846dee2472beb5697f9c26263b60ceca47d49ad4 100644 (file)
--- a/src/protocols/vmps/vmps.h
+++ b/src/protocols/vmps/vmps.h
@@ -63,13 +63,6 @@ int fr_vmps_init(void);
 
 void fr_vmps_free(void);
 
-/** Used as the decoder ctx
- *
- */
-typedef struct {
-       fr_dict_attr_t const *root;
-} fr_vmps_ctx_t;
-
 #ifdef __cplusplus
 }
 #endif