Skip to content

Commit 51ad22b

Browse files
committed
remove last vestiges of tmpl_attr_prefix_t
1 parent 19b600d commit 51ad22b

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

src/coverity-model/merged_model.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,11 @@ ssize_t xlat_eval(char *out, size_t outlen, request_t *request,
225225
typedef struct {
226226
} tmpl_t;
227227

228-
typedef enum {
229-
TMPL_ATTR_REF_PREFIX_YES = 0, //!< Attribute refs must have '&' prefix.
230-
TMPL_ATTR_REF_PREFIX_NO, //!< Attribute refs have no '&' prefix.
231-
TMPL_ATTR_REF_PREFIX_AUTO //!< Attribute refs may have a '&' prefix.
232-
} tmpl_attr_prefix_t;
233-
234228
typedef struct {
235229
} fr_sbuff_escape_rules_t;
236230

237231
fr_slen_t tmpl_print(fr_sbuff_t *out, tmpl_t const *vpt,
238-
tmpl_attr_prefix_t ar_prefix, fr_sbuff_escape_rules_t const *e_rules)
232+
fr_sbuff_escape_rules_t const *e_rules)
239233
{
240234
fr_slen_t result;
241235

src/lib/server/tmpl.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -260,15 +260,6 @@ typedef struct tmpl_s tmpl_t;
260260
# define _CONST
261261
#endif
262262

263-
/** Specify whether attribute references require a prefix
264-
*
265-
*/
266-
typedef enum {
267-
TMPL_ATTR_REF_PREFIX_YES = 0, //!< Attribute refs must have '&' prefix.
268-
TMPL_ATTR_REF_PREFIX_NO, //!< Attribute refs have no '&' prefix.
269-
TMPL_ATTR_REF_PREFIX_AUTO //!< Attribute refs may have a '&' prefix.
270-
} tmpl_attr_prefix_t;
271-
272263
/** Specify whether attribute references can have a list (or parent) reference
273264
*
274265
*/
@@ -309,9 +300,6 @@ struct tmpl_attr_rules_s {
309300
fr_dict_attr_t const *list_def; //!< Default list to use with unqualified
310301
///< attribute reference.
311302

312-
tmpl_attr_prefix_t prefix; //!< Whether the attribute reference requires
313-
///< a prefix.
314-
315303
tmpl_attr_list_presence_t list_presence; //!< Whether the attribute reference can
316304
///< have a list, forbid it, or require it.
317305

@@ -574,8 +562,6 @@ struct tmpl_s {
574562
///< and TMPL_TYPE_REGEX_UNCOMPILED.
575563

576564
_CONST struct {
577-
bool ref_prefix; //!< true if the reference was prefixed
578-
///< with a '&'.
579565
FR_DLIST_HEAD(tmpl_request_list) rr; //!< Request to search or insert in.
580566
FR_DLIST_HEAD(tmpl_attr_list) ar; //!< Head of the attribute reference list.
581567
} attribute;

0 commit comments

Comments
 (0)