diff options
| -rw-r--r-- | filter/f-inst.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/filter/f-inst.c b/filter/f-inst.c index 6999d433..fbb68a96 100644 --- a/filter/f-inst.c +++ b/filter/f-inst.c @@ -1338,17 +1338,18 @@ ARG(1, T_TLVLIST); ARG(2, T_SET); METHOD_CONSTRUCTOR("add"); + if (subtlv_set_type(v2.val.t)) - RESULT_(T_TLVLIST, tl, [[ tlv_set_add(fpool, v1.val.tl, tlv_alloc(fpool, v2.val.t)) ]]); + RESULT(T_TLVLIST, tl, [[ tlv_set_add(fpool, v1.val.tl, tlv_alloc(fpool, v2.val.t)) ]]); else runtime("Can't add non-tlv"); } - INST(FI_TLVLIST_ADD_SET, 2, 1) { + INST(FI_TLVLIST_ADD_TLVLIST, 2, 1) { ARG(1, T_TLVLIST); ARG(2, T_TLVLIST); METHOD_CONSTRUCTOR("add"); - RESULT_(T_TLVLIST, tl, [[ tlv_set_union(fpool, v1.val.tl, v2.val.tl) ]]); + RESULT(T_TLVLIST, tl, [[ tlv_set_union(fpool, v1.val.tl, v2.val.tl) ]]); } INST(FI_PATH_DELETE_INT, 2, 1) { @@ -1475,7 +1476,7 @@ if (!subtlv_set_type(v2.val.t)) runtime("Mismatched set type"); - RESULT_(T_TLVLIST, tl, [[ tlvlist_filter(fpool, v1.val.tl, &v2, 0) ]]); + RESULT(T_TLVLIST, tl, [[ tlvlist_filter(fpool, v1.val.tl, &v2, 0) ]]); } #endif @@ -1550,7 +1551,7 @@ ARG(2, T_SET); METHOD_CONSTRUCTOR("filter"); - RESULT_(T_TLVLIST, tl, [[ tlvlist_filter(fpool, v1.val.tl, &v2, 1) ]]); + RESULT(T_TLVLIST, tl, [[ tlvlist_filter(fpool, v1.val.tl, &v2, 1) ]]); } INST(FI_TLVLIST_FILTER_SET, 2, 1) { @@ -1561,7 +1562,7 @@ if (!subtlv_set_type(v2.val.t)) runtime("Mismatched set type"); - RESULT_(T_TLVLIST, tl, [[ tlvlist_filter(fpool, v1.val.tl, &v2, 1) ]]); + RESULT(T_TLVLIST, tl, [[ tlvlist_filter(fpool, v1.val.tl, &v2, 1) ]]); } #endif |