From: Alan T. DeKok Date: Sat, 17 Aug 2024 12:55:24 +0000 (-0400) Subject: simplify a bit X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da3e9ff3398fcabbe177949e07d85c0b29ea0742;p=thirdparty%2Ffreeradius-server.git simplify a bit --- diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c index e11aab4236b..06f97f55d4f 100644 --- a/src/lib/util/pair.c +++ b/src/lib/util/pair.c @@ -3121,8 +3121,7 @@ int fr_pair_value_mem_append_buffer(fr_pair_t *vp, uint8_t *src, bool tainted) */ char const *fr_pair_value_enum(fr_pair_t const *vp, char buff[20]) { - char const *str; - fr_dict_enum_value_t const *enumv = NULL; + fr_dict_enum_value_t const *enumv; if (!fr_box_is_numeric(&vp->data)) { fr_strerror_printf("Pair %s is not numeric", vp->da->name); @@ -3135,17 +3134,12 @@ char const *fr_pair_value_enum(fr_pair_t const *vp, char buff[20]) default: enumv = fr_dict_enum_by_value(vp->da, &vp->data); + if (enumv) return enumv->name; break; } - if (!enumv) { - fr_pair_print_value_quoted(&FR_SBUFF_OUT(buff, 20), vp, T_BARE_WORD); - str = buff; - } else { - str = enumv->name; - } - - return str; + fr_pair_print_value_quoted(&FR_SBUFF_OUT(buff, 20), vp, T_BARE_WORD); + return buff; } /** Get value box of a VP, optionally prefer enum value.