unify function prototypes

diff --git a/src/lib/util/encode.c b/src/lib/util/encode.c
index 9f7fe1df63c5555c23c56c8f15497bce127ac608..5030c8534e8fcc4a2a25edc1f576578a5d01bdc2 100644 (file)
--- a/src/lib/util/encode.c
+++ b/src/lib/util/encode.c
@@ -40,7 +40,7 @@
  *     - < 0 on error.
  */
 ssize_t fr_pair_array_to_network(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, int depth,
-                                fr_dcursor_t *cursor, void *encode_ctx, fr_proto_encode_value_t encode_value)
+                                fr_dcursor_t *cursor, void *encode_ctx, fr_encode_dbuff_t encode_value)
 {
        ssize_t                 slen;
        fr_dbuff_t              work_dbuff = FR_DBUFF(dbuff);

diff --git a/src/lib/util/encode.h b/src/lib/util/encode.h
index ee421ed9aca8548724a021e409a0f018112797c9..754803324cddbe77c11877eb3bfdc0bc38547157 100644 (file)
--- a/src/lib/util/encode.h
+++ b/src/lib/util/encode.h
@@ -34,14 +34,14 @@ extern "C" {
 /** Typedefs for simplifying the use and declaration of protocol encoders
  *
  */
-typedef ssize_t (*fr_proto_encode_value_t)(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth,
-                                          fr_dcursor_t *cursor, void *encode_ctx);
+typedef ssize_t (*fr_encode_dbuff_t)(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth,
+                                    fr_dcursor_t *cursor, void *encode_ctx);
 
 #define PROTO_ENCODE_FUNC(_name) static ssize_t _name(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth, \
                                           fr_dcursor_t *cursor, void *encode_ctx);
 
 ssize_t fr_pair_array_to_network(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, int depth,
-                                fr_dcursor_t *cursor, void *encode_ctx, fr_proto_encode_value_t encode_value);
+                                fr_dcursor_t *cursor, void *encode_ctx, fr_encode_dbuff_t encode_value);
 
 
 #ifdef __cplusplus

diff --git a/src/lib/util/struct.h b/src/lib/util/struct.h
index b7fba2a32f987c92b3047e4748fcfb2142d89646..ad6ff37fa1c2e82e51a9ddecdb55eaacba09f875 100644 (file)
--- a/src/lib/util/struct.h
+++ b/src/lib/util/struct.h
@@ -28,6 +28,7 @@ RCSIDH(struct_h, "$Id$")
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/decode.h>
+#include <freeradius-devel/util/encode.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,9 +39,6 @@ ssize_t fr_struct_from_network(TALLOC_CTX *ctx, fr_pair_list_t *out,
                               bool nested, void *decode_ctx,
                               fr_pair_decode_value_t decode_value, fr_pair_decode_value_t decode_tlv) CC_HINT(nonnull(2,3,4));
 
-typedef ssize_t (*fr_encode_dbuff_t)(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth,
-                                    fr_dcursor_t *cursor, void *encode_ctx);
-
 ssize_t fr_struct_to_network(fr_dbuff_t *dbuff, fr_da_stack_t *da_stack, unsigned int depth,
                             fr_dcursor_t *cursor, void *encode_ctx,
                             fr_encode_dbuff_t encode_value, fr_encode_dbuff_t encode_cursor) CC_HINT(nonnull(1,2,4));