From: Nick Porter Date: Tue, 22 Dec 2020 17:18:26 +0000 (+0000) Subject: Amend _fr_pair_list_log() to handle fr_pair_list_t X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b064366ff7246bbdf7f25e1774de8e6b95c396f7;p=thirdparty%2Ffreeradius-server.git Amend _fr_pair_list_log() to handle fr_pair_list_t --- diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c index ff707d095e5..a6ebe28b3ed 100644 --- a/src/lib/util/pair_print.c +++ b/src/lib/util/pair_print.c @@ -154,19 +154,16 @@ void fr_pair_fprint(FILE *fp, fr_pair_t const *parent, fr_pair_t const *vp) /** Print a list of attributes and enumv * * @param[in] log to output to. + * @param[in] lvl depth in structural attribute. * @param[in] list to print. * @param[in] file where the message originated * @param[in] line where the message originated */ void _fr_pair_list_log(fr_log_t const *log, int lvl, fr_pair_list_t const *list, char const *file, int line) { - fr_pair_list_t *our_list; - fr_pair_t *vp; - fr_cursor_t cursor; + fr_pair_t *vp; - memcpy(&our_list, &list, sizeof(list)); /* const work-arounds */ - - for (vp = fr_cursor_init(&cursor, our_list); vp; vp = fr_cursor_next(&cursor)) {\ + for (vp = fr_pair_list_head(list); vp; vp = fr_pair_list_next(list, vp)) { \ switch (vp->da->type) { case FR_TYPE_STRUCTURAL: fr_log(log, L_DBG, file, line, "%*s%s {", lvl * 2, "", vp->da->name);