MINOR: pattern: prepare removal of a pattern from the list head
Instead of using LIST_DEL() on the pattern itself inside an expression,
we look it up from its head. The goal is to get rid of the double-linked
list while this usage remains exclusively for freeing on startup error!
diff --git a/src/pattern.c b/src/pattern.c
index b2f06fe..612abca 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -1120,6 +1120,23 @@
return NULL;
}
+/* finds the pattern holding <list> from list head <head> and deletes it.
+ * This is made for use for pattern removal within an expression.
+ */
+static void pat_unlink_from_head(struct list *head, struct list *list)
+{
+ struct list *next;
+
+ next = head->n;
+ while (next != head) {
+ if (next == list) {
+ LIST_DEL(list);
+ return;
+ }
+ next = next->n;
+ }
+}
+
void free_pattern_tree(struct eb_root *root)
{
struct eb_node *node, *next;
@@ -1130,7 +1147,7 @@
next = eb_next(node);
eb_delete(node);
elt = container_of(node, struct pattern_tree, node);
- LIST_DEL(&elt->from_ref);
+ pat_unlink_from_head(&elt->ref->tree_head, &elt->from_ref);
free(elt->data);
free(elt);
node = next;
@@ -1143,7 +1160,7 @@
list_for_each_entry_safe(pat, tmp, &expr->patterns, list) {
LIST_DEL(&pat->list);
- LIST_DEL(&pat->from_ref);
+ pat_unlink_from_head(&pat->pat.ref->list_head, &pat->from_ref);
if (pat->pat.sflags & PAT_SF_REGFREE)
regex_free(pat->pat.ptr.ptr);
else