From: Alan T. DeKok Date: Tue, 19 Apr 2022 16:25:35 +0000 (-0400) Subject: fix function signature to shut up compiler X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a61873c96180422c5152458cd91c16107c451e1;p=thirdparty%2Ffreeradius-server.git fix function signature to shut up compiler --- diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c index 9b6498c8ffd..d995cd53b8f 100644 --- a/src/protocols/radius/decode.c +++ b/src/protocols/radius/decode.c @@ -421,7 +421,7 @@ static ssize_t decode_concat(TALLOC_CTX *ctx, fr_pair_list_t *list, /* * Short-term hack to help clean things up. */ -#define decode_value ((fr_pair_decode_value_t) fr_radius_decode_pair_value) +#define decode_value fr_radius_decode_pair_value /** decode an RFC-format TLV * @@ -1332,7 +1332,7 @@ static ssize_t decode_tlv_trampoline(TALLOC_CTX *ctx, fr_pair_list_t *out, ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t const *parent, uint8_t const *data, size_t const attr_len, - fr_radius_ctx_t *packet_ctx) + void *decode_ctx) { int8_t tag = 0; size_t data_len; @@ -1342,6 +1342,7 @@ ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_pair_t *vp = NULL; uint8_t const *p = data; uint8_t buffer[256]; + fr_radius_ctx_t *packet_ctx = decode_ctx; if (attr_len > 128 * 1024) { fr_strerror_printf("%s: packet is too large to be RADIUS", __FUNCTION__); diff --git a/src/protocols/radius/radius.h b/src/protocols/radius/radius.h index e07d625cce8..b959b4aeeaa 100644 --- a/src/protocols/radius/radius.h +++ b/src/protocols/radius/radius.h @@ -210,7 +210,7 @@ ssize_t fr_radius_decode_tunnel_password(uint8_t *encpw, size_t *len, char cons ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, fr_pair_list_t *list, fr_dict_attr_t const *parent, uint8_t const *data, size_t const attr_len, - fr_radius_ctx_t *packet_ctx) CC_HINT(nonnull); + void *packet_ctx) CC_HINT(nonnull); ssize_t fr_radius_decode_tlv(TALLOC_CTX *ctx, fr_pair_list_t *list, fr_dict_attr_t const *parent,