From: Maria Matejka <mq@ucw.cz>
Date: Sat, 26 Mar 2022 14:05:03 +0000 (+0100)
Subject: Filters: removing adata_empty() duplicating lp_alloc_adata()
X-Git-Tag: v3.0-alpha1~171^2~65^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f59d5d9dc11dcc5513ed1fdfcb12c1730b4a19;p=thirdparty%2Fbird.git

Filters: removing adata_empty() duplicating lp_alloc_adata()
---

diff --git a/filter/data.c b/filter/data.c
index c3f8bf573..feb8c8bb6 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -93,14 +93,6 @@ const struct f_val f_const_empty_path = {
   .val.ad = &null_adata,
 };
 
-static struct adata *
-adata_empty(struct linpool *pool, int l)
-{
-  struct adata *res = lp_alloc(pool, sizeof(struct adata) + l);
-  res->length = l;
-  return res;
-}
-
 static void
 pm_format(const struct f_path_mask *p, buffer *buf)
 {
@@ -423,7 +415,7 @@ clist_filter(struct linpool *pool, const struct adata *list, const struct f_val
   if (nl == list->length)
     return list;
 
-  struct adata *res = adata_empty(pool, nl);
+  struct adata *res = lp_alloc_adata(pool, nl);
   memcpy(res->data, tmp, nl);
   return res;
 }
@@ -457,7 +449,7 @@ eclist_filter(struct linpool *pool, const struct adata *list, const struct f_val
   if (nl == list->length)
     return list;
 
-  struct adata *res = adata_empty(pool, nl);
+  struct adata *res = lp_alloc_adata(pool, nl);
   memcpy(res->data, tmp, nl);
   return res;
 }
@@ -489,7 +481,7 @@ lclist_filter(struct linpool *pool, const struct adata *list, const struct f_val
   if (nl == list->length)
     return list;
 
-  struct adata *res = adata_empty(pool, nl);
+  struct adata *res = lp_alloc_adata(pool, nl);
   memcpy(res->data, tmp, nl);
   return res;
 }