rem: if (!(flags & AVP_NAME_STR) && !(flags & AVP_NAME_RE)) {
add: if (flags & AVP_NAME_STR) {
context: avp_t *search_first_avp(unsigned short flags, int_str name, int_str *val, struct search_state* s){	static struct search_state st;	assert( crt_user_avps != 0 );	assert( crt_domain_avps != 0);	assert( crt_global_avps != 0);	if (name.s==0) {		LOG(L_ERR,"ERROR:avp:search_first_avp: 0 ID or NULL NAME AVP!");		return 0;	}	if (!s) s = &st;	if ((flags & ALL_AVP_CLASSES) == 0) {		     /* The caller did not specify any class to search in, so enable		      * all of them by default		      */		flags |= ALL_AVP_CLASSES;	}	s->flags = flags;	if (IS_USER_AVP(flags)) {		s->avp = *crt_user_avps;	} else if (IS_DOMAIN_AVP(flags)) {		s->avp = *crt_domain_avps;	} else {		s->avp = *crt_global_avps;	}	s->name = name;	if (!(flags & AVP_NAME_STR) && !(flags & AVP_NAME_RE)) {		s->id = compute_ID(name.s);	}	return search_next_avp(s, val);}