Skip to content

Commit

Permalink
Assert not required and causes warnings with NDEBUG
Browse files Browse the repository at this point in the history
  • Loading branch information
arr2036 committed May 29, 2015
1 parent 28ccbfd commit e8f3f8d
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/main/conffile.c
Expand Up @@ -1155,7 +1155,7 @@ static inline int fr_item_validate_ipaddr(CONF_SECTION *cs, char const *name, PW
int cf_item_parse(CONF_SECTION *cs, char const *name, unsigned int type, void *data, char const *dflt)
{
int rcode;
bool deprecated, required, attribute, secret, file_input, cant_be_empty, tmpl, xlat, multi;
bool deprecated, required, attribute, secret, file_input, cant_be_empty, tmpl, multi;
char **q;
char const *value;
CONF_PAIR *cp = NULL;
Expand All @@ -1171,7 +1171,6 @@ int cf_item_parse(CONF_SECTION *cs, char const *name, unsigned int type, void *d
file_input = (type == PW_TYPE_FILE_INPUT); /* check, not and */
cant_be_empty = (type & PW_TYPE_NOT_EMPTY);
tmpl = (type & PW_TYPE_TMPL);
xlat = (type & PW_TYPE_XLAT);
multi = (type & PW_TYPE_MULTI);

if (attribute) required = true;
Expand Down Expand Up @@ -1260,7 +1259,6 @@ int cf_item_parse(CONF_SECTION *cs, char const *name, unsigned int type, void *d
}

rad_assert(!attribute);
rad_assert(!xlat);
vpt = tmpl_alloc(cs, TMPL_TYPE_LITERAL, value, strlen(value));
*(vp_tmpl_t **)data = vpt;

Expand Down

0 comments on commit e8f3f8d

Please sign in to comment.