From 8f1fff2e6a5c114c6beafd2983afb55acd3d66ae Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Thu, 1 Feb 2001 20:21:25 +0000 Subject: Create a more modular type system for the FT_* types. Put them into epan/ftypes. Re-write display filter routines using Lemon parser instead of yacc. Besides using a different tool, the new grammar is much simpler, while the display filter engine itself is more powerful and more easily extended. Add dftest executable, to test display filter "bytecode" generation. Add option to "configure" to build dftest or randpkt, both of which are not built by default. Implement Ed Warnicke's ideas about dranges in the new display filter and ftype code. Remove type FT_TEXT_ONLY in favor of FT_NONE, and have protocols registered as FT_PROTOCOL. Thus, FT_NONE is used only for simple labels in the proto tree, while FT_PROTOCOL is used for protocols. This was necessary for being able to make byte slices (ranges) out of protocols, like "frame[0:3]" Win32 Makefile.nmake's will be added tonight. svn path=/trunk/; revision=2967 --- gtk/find_dlg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk/find_dlg.c') diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 9203899baf..18b827f8f5 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -1,7 +1,7 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c,v 1.18 2001/01/21 02:27:24 guy Exp $ + * $Id: find_dlg.c,v 1.19 2001/02/01 20:21:21 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -37,7 +37,7 @@ #include #include "proto.h" -#include "dfilter.h" +#include "dfilter/dfilter.h" #include "globals.h" #include "ui_util.h" @@ -187,7 +187,7 @@ find_frame_ok_cb(GtkWidget *ok_bt, gpointer parent_w) { GtkWidget *filter_te, *backward_rb; gchar *filter_text; - dfilter *sfcode; + dfilter_t *sfcode; filter_te = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_FIND_FILT_KEY); backward_rb = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w), E_FIND_BACKWARD_KEY); @@ -197,7 +197,7 @@ find_frame_ok_cb(GtkWidget *ok_bt, gpointer parent_w) /* * Try to compile the filter. */ - if (dfilter_compile(filter_text, &sfcode) != 0) { + if (!dfilter_compile(filter_text, &sfcode)) { /* The attempt failed; report an error. */ simple_dialog(ESD_TYPE_CRIT, NULL, dfilter_error_msg); return; -- cgit v1.2.3