From 2a328da4ef66f37388b841803b2df149b4f68840 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 13 Aug 2010 07:39:46 +0000 Subject: Instead of using a Boolean for the search direction, use an enum, so that you can tell from examination whether the search is forward or backward. Make the cf_find_packet routines take the direction as an explicit argument, rather than, in the cases where you don't want to permanently set the direction, saving the direction in the capture_file structure, changing it, doing the search, and restoring the saved direction. Give more information in the Doxygen comments for those routines. Add a cf_find_packet_dfilter_string() routine, which takes a filter string rather than a compiled filter as an argument. Replace find_previous_next_frame_with_filter() with it. Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if the read fails, rather than leaving that up to its caller. That lets us eliminate cf_read_error_message(), by swallowing its code into cf_read_frame_r(). Add Doxygen comments for cf_read_frame_r() and cf_read_frame(). Don't have find_packet() read the packet before calling the callback routine; leave that up to the callback routine. Add cf_find_packet_marked(), to find the next or previous marked packet, and cf_find_packet_time_reference(), to find the next or previous time reference packet. Those routines do *not* need to read the packet data to see if it matches; that lets them run much faster. Clean up indentation. svn path=/trunk/; revision=33791 --- gtk/packet_win.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gtk/packet_win.c') diff --git a/gtk/packet_win.c b/gtk/packet_win.c index 32ad374538..9b1cdad175 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -131,11 +131,6 @@ void new_window_cb(GtkWidget *w _U_) struct PacketWinData *DataPtr; int i; -#ifdef NEW_PACKET_LIST - int err; - gchar *err_info; -#endif /* NEW_PACKET_LIST */ - if (!cfile.current_frame) { /* nothing has been captured so far */ return; @@ -144,10 +139,9 @@ void new_window_cb(GtkWidget *w _U_) #ifdef NEW_PACKET_LIST /* With the new packetlists "lazy columns" it's neccesary to reread the frame */ - if (!cf_read_frame(&cfile, cfile.current_frame, &err, &err_info)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - cf_read_error_message(err, err_info), cfile.filename); - return; + if (!cf_read_frame(&cfile, cfile.current_frame)) { + /* error reading the frame */ + return; } #endif -- cgit v1.2.3