From: James Jones Date: Mon, 6 Jun 2022 14:26:45 +0000 (-0500) Subject: Cast to void calla that never fail or where we care only about side effects. (#4547) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e035d0b7631b65021c93f4d745ba8a30c583587;p=thirdparty%2Ffreeradius-server.git Cast to void calla that never fail or where we care only about side effects. (#4547) This branch deals with the following Coverity defect reports: 1504001, 1503991, 1504025 (#2 of 2), 1503276, 1504185, 1504279, 1504281 --- diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c index 350ba289ebe..ccdbdda8020 100644 --- a/src/lib/server/tmpl_tokenize.c +++ b/src/lib/server/tmpl_tokenize.c @@ -1873,7 +1873,10 @@ ssize_t tmpl_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t *err, break; case TMPL_ATTR_REF_PREFIX_AUTO: - fr_sbuff_next_if_char(&our_name, '&'); + /* + * '&' prefix can be there, but doesn't have to be + */ + (void) fr_sbuff_next_if_char(&our_name, '&'); break; } diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c index 8101ba2a283..9d52ab57916 100644 --- a/src/lib/util/dict_util.c +++ b/src/lib/util/dict_util.c @@ -334,7 +334,7 @@ static inline CC_HINT(always_inline) int dict_attr_name_set(fr_dict_attr_t **da_ fr_sbuff_t unknown_name = FR_SBUFF_OUT(buffer, sizeof(buffer)); - fr_sbuff_in_sprintf(&unknown_name, "%u", da->attr); + (void) fr_sbuff_in_sprintf(&unknown_name, "%u", da->attr); name = fr_sbuff_buff(&unknown_name); name_len = fr_sbuff_used(&unknown_name); diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c index 5e2ddc92712..51888eb1081 100644 --- a/src/lib/util/pair_print.c +++ b/src/lib/util/pair_print.c @@ -133,7 +133,7 @@ void fr_pair_fprint(FILE *fp, fr_pair_t const *vp) PAIR_VERIFY(vp); - fr_sbuff_in_char(&sbuff, '\t'); + (void) fr_sbuff_in_char(&sbuff, '\t'); fr_pair_print(&sbuff, NULL, vp); fr_sbuff_in_char(&sbuff, '\n'); @@ -151,7 +151,7 @@ static void fr_pair_list_log_sbuff(fr_log_t const *log, int lvl, fr_pair_t *pare fr_sbuff_set_to_start(sbuff); - if (vp->da->flags.is_raw) fr_sbuff_in_strcpy(sbuff, "raw."); + if (vp->da->flags.is_raw) (void) fr_sbuff_in_strcpy(sbuff, "raw."); if (parent && (parent->da->type != FR_TYPE_GROUP)) parent_da = parent->da; if (fr_dict_attr_oid_print(sbuff, parent_da, vp->da, false) <= 0) return; diff --git a/src/modules/rlm_smtp/rlm_smtp.c b/src/modules/rlm_smtp/rlm_smtp.c index 8f5b19a8b2c..7ad24cee0ff 100644 --- a/src/modules/rlm_smtp/rlm_smtp.c +++ b/src/modules/rlm_smtp/rlm_smtp.c @@ -320,7 +320,7 @@ static int tmpl_arr_to_header(rlm_smtp_thread_t *t, fr_mail_ctx_t *uctx, struct /* Initialize the buffer for the recipients. Used for TO */ fr_sbuff_init_talloc(uctx, &sbuff, &sbuff_ctx, 256, SIZE_MAX); /* Add the preposition for the header element */ - fr_sbuff_in_strcpy(&sbuff, preposition); + (void) fr_sbuff_in_strcpy(&sbuff, preposition); talloc_foreach(tmpl, vpt) { /* If there have already been elements added, keep them comma separated */ @@ -482,7 +482,7 @@ static int generate_from_header(rlm_smtp_thread_t *t, fr_mail_ctx_t *uctx, struc fr_sbuff_init_talloc(uctx, &sbuff, &sbuff_ctx, 256, SIZE_MAX); /* Add the preposition for the header element */ - fr_sbuff_in_strcpy(&sbuff, from); + (void) fr_sbuff_in_strcpy(&sbuff, from); /* Copy the envelope address as the FROM: source */ fr_sbuff_in_bstrncpy(&sbuff, inst->envelope_address, strlen(inst->envelope_address)); diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c index 0426af1072a..8686942d922 100644 --- a/src/protocols/radius/encode.c +++ b/src/protocols/radius/encode.c @@ -89,7 +89,7 @@ static ssize_t encode_password(fr_dbuff_t *dbuff, fr_dbuff_marker_t *input, size if (len > RADIUS_MAX_PASS_LENGTH) len = RADIUS_MAX_PASS_LENGTH; - fr_dbuff_out_memcpy(passwd, input, len); + (void) fr_dbuff_out_memcpy(passwd, input, len); if (len < sizeof(passwd)) memset(passwd + len, 0, sizeof(passwd) - len); if (len == 0) len = AUTH_PASS_LEN;