Moved global memory alloction used in display filters (which was stored

in dfilter-grammar.y) to a new struct dfilter. Display filters now have
their own struct, rather than simply being GNode's. This allows multiple
display filters to exist at once, aiding John McDermott in his
work on colorization.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@480 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 4 insertions, 5 deletions

diff --git a/summary.c b/summary.c
index fd02eb17e1..3d975f8ed2 100644
--- a/summary.c
+++ b/summary.c
@@ -1,7 +1,7 @@
 /* summary.c
  * Routines for capture file summary window
  *
- * $Id: summary.c,v 1.8 1999/08/10 04:13:36 guy Exp $
+ * $Id: summary.c,v 1.9 1999/08/13 23:47:43 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -250,10 +250,9 @@ traffic_bytes/seconds);
   }
   add_string_to_box(string_buff, capture_box);
 
-  /* Display filter. The situation where cf.dfilter="" and cf.dfcode=NULL can exist,
-	so I'll check for both */
-  if (cf.dfilter && cf.dfcode) {
-    snprintf(string_buff, SUM_STR_MAX, "Display filter: %s", cf.dfilter);
+  /* Display filter */
+  if (DFILTER_CONTAINS_FILTER(cf.dfcode)) {
+    snprintf(string_buff, SUM_STR_MAX, "Display filter: %s", cf.dfcode->dftext);
   } else {
     sprintf(string_buff, "Display filter: none");
   }