summaryrefslogtreecommitdiff
path: root/dfilter-grammar.y
diff options
context:
space:
mode:
Diffstat (limited to 'dfilter-grammar.y')
-rw-r--r--dfilter-grammar.y24
1 files changed, 2 insertions, 22 deletions
diff --git a/dfilter-grammar.y b/dfilter-grammar.y
index 0677cb5e13..0f298bd2a0 100644
--- a/dfilter-grammar.y
+++ b/dfilter-grammar.y
@@ -3,7 +3,7 @@
/* dfilter-grammar.y
* Parser for display filters
*
- * $Id: dfilter-grammar.y,v 1.21 1999/10/11 03:03:10 guy Exp $
+ * $Id: dfilter-grammar.y,v 1.22 1999/10/11 06:39:04 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -94,14 +94,7 @@ static int ether_str_to_guint8_array(const char *s, guint8 *mac);
/* This is the dfilter we're currently processing. It's how
* dfilter_compile communicates with us.
*/
-dfilter *global_df = NULL;;
-
-/* list of GNodes allocated during parsing. If the parsing fails, we'll
- * use this list to free all the GNodes. If the parsing succeeds, we'll
- * just clear this list since dfilter_clear_filter() will take care of
- * freeing the GNodes when they're no longer needed.
- */
-GSList *gnode_slist = NULL;
+dfilter *global_df = NULL;
%}
@@ -369,7 +362,6 @@ dfilter_mknode_join(GNode *n1, enum node_type ntype, int operand, GNode *n2)
g_node_append(gnode_root, n1);
g_node_append(gnode_root, n2);
- gnode_slist = g_slist_append(gnode_slist, gnode_root);
return gnode_root;
}
@@ -389,7 +381,6 @@ dfilter_mknode_unary(int operand, GNode *n2)
gnode_root = g_node_new(node_root);
g_node_append(gnode_root, n2);
- gnode_slist = g_slist_append(gnode_slist, gnode_root);
return gnode_root;
}
@@ -408,7 +399,6 @@ dfilter_mknode_numeric_variable(gint id)
node->value.variable = id;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -426,7 +416,6 @@ dfilter_mknode_ether_variable(gint id)
node->value.variable = id;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -444,7 +433,6 @@ dfilter_mknode_ipxnet_variable(gint id)
node->value.variable = id;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -462,7 +450,6 @@ dfilter_mknode_ipv4_variable(gint id)
node->value.variable = id;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -482,7 +469,6 @@ dfilter_mknode_bytes_variable(gint id, gint offset, guint length)
node->length = length;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -500,7 +486,6 @@ dfilter_mknode_numeric_value(guint32 val)
node->value.numeric = val;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -528,7 +513,6 @@ dfilter_mknode_ether_value(gchar *byte_string)
}
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -546,7 +530,6 @@ dfilter_mknode_ipxnet_value(guint32 ipx_net_val)
node->value.numeric = ipx_net_val;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -570,7 +553,6 @@ dfilter_mknode_ipv4_value(char *host)
node->value.numeric = htonl(node->value.numeric);
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -590,7 +572,6 @@ dfilter_mknode_bytes_value(GByteArray *barray)
node->length = barray->len;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}
@@ -620,7 +601,6 @@ dfilter_mknode_existence(gint id)
node->value.variable = id;
gnode = g_node_new(node);
- gnode_slist = g_slist_append(gnode_slist, gnode);
return gnode;
}