From: James Jones Date: Tue, 14 Jun 2022 02:33:13 +0000 (-0500) Subject: Still more voiding of calls we know will work. (#4552) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=181cac09ee0ead0d4cc9df0e78564b5db81a71c1;p=thirdparty%2Ffreeradius-server.git Still more voiding of calls we know will work. (#4552) This deals with the following CIDs: 1503974, 1504043, 1504182, 1504183, 1504184 --- diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c index c5602dabe4a..717092c570e 100644 --- a/src/lib/unlang/xlat_tokenize.c +++ b/src/lib/unlang/xlat_tokenize.c @@ -228,7 +228,7 @@ static inline int xlat_tokenize_regex(xlat_exp_head_t *head, fr_sbuff_t *in) fr_sbuff_marker(&m_s, in); - fr_sbuff_out(&err, &num, in); + (void) fr_sbuff_out(&err, &num, in); if (err != FR_SBUFF_PARSE_OK) { invalid_ref: fr_strerror_printf("Invalid regex reference. Must be in range 0-%u", REQUEST_MAX_REGEX); @@ -1052,7 +1052,7 @@ static int xlat_tokenize_string(xlat_exp_head_t *head, * Free our temporary array of terminals */ if (tokens != &expansions) talloc_free(tokens); - + return 0; } diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c index 2059571554c..7faf3a07582 100644 --- a/src/lib/util/struct.c +++ b/src/lib/util/struct.c @@ -804,9 +804,9 @@ done: if (do_length) { if (parent->flags.subtype == FLAG_LENGTH_UINT8) { - fr_dbuff_in(&hdr, (uint8_t) (fr_dbuff_used(&work_dbuff) - 1)); + (void) fr_dbuff_in(&hdr, (uint8_t) (fr_dbuff_used(&work_dbuff) - 1)); } else { - fr_dbuff_in(&hdr, (uint16_t) (fr_dbuff_used(&work_dbuff) - 2)); + (void) fr_dbuff_in(&hdr, (uint16_t) (fr_dbuff_used(&work_dbuff) - 2)); } } diff --git a/src/modules/rlm_escape/rlm_escape.c b/src/modules/rlm_escape/rlm_escape.c index 6d5fe3da71a..cf11bf74cf6 100644 --- a/src/modules/rlm_escape/rlm_escape.c +++ b/src/modules/rlm_escape/rlm_escape.c @@ -152,7 +152,7 @@ static xlat_action_t unescape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out, if (*p != '=') { next: - fr_sbuff_in_char(&sbuff, *p++); + (void) fr_sbuff_in_char(&sbuff, *p++); continue; } @@ -163,7 +163,7 @@ static xlat_action_t unescape_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out, !(c2 = memchr(hextab, tolower(*(p + 2)), 16))) goto next; c3 = ((c1 - hextab) << 4) + (c2 - hextab); - fr_sbuff_in_char(&sbuff, c3); + (void) fr_sbuff_in_char(&sbuff, c3); p += 3; } diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c index 41f319d63d0..656c662e228 100644 --- a/src/protocols/radius/encode.c +++ b/src/protocols/radius/encode.c @@ -192,7 +192,7 @@ static ssize_t encode_tunnel_password(fr_dbuff_t *dbuff, fr_dbuff_marker_t *in, /* * Copy the password over, and fill the remainder with random data. */ - fr_dbuff_out_memcpy(tpasswd + 3, in, inlen); + (void) fr_dbuff_out_memcpy(tpasswd + 3, in, inlen); for (i = 3 + inlen; i < sizeof(tpasswd); i++) { tpasswd[i] = fr_fast_rand(&packet_ctx->rand_ctx); @@ -612,7 +612,7 @@ static ssize_t encode_value(fr_dbuff_t *dbuff, * Only 24bit integers are allowed here */ fr_dbuff_set(&src, &value_start); - fr_dbuff_out(&msb, &src); + (void) fr_dbuff_out(&msb, &src); if (msb != 0) { fr_strerror_const("Integer overflow for tagged uint32 attribute"); return PAIR_ENCODE_SKIPPED;