1
0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00

Merge commit 'a5a6de58' into thread-next

Conflicts:
      filter/config.Y
      filter/data.h
      filter/data.c
This commit is contained in:
Maria Matejka
2023-10-24 10:39:52 +02:00
4 changed files with 23 additions and 31 deletions

View File

@@ -873,7 +873,7 @@
ACCESS_RTE;
RESULT_TYPE(da->type);
{
const struct f_val *empty;
struct f_val empty;
const eattr *e = ea_find(fs->rte->attrs, da->id);
if (e)
@@ -891,8 +891,8 @@
}]]);
}
}
else if (empty = f_get_empty(da->type))
RESULT_VAL(*empty);
else if ((empty = f_get_empty(da->type)).type != T_VOID)
RESULT_VAL(empty);
else
RESULT_VOID;
}