osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add NEW_PACKET_LIST guard to color_filters_colorize_packet() 

svn path=/trunk/; revision=29729
This commit is contained in:
Kovarththanan Rajaratnam 2009-09-06 06:07:53 +00:00
parent 2ab0685d8a
commit 5c51aacb21
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
color_filters.c
View File

@ -439,10 +439,14 @@ color_filters_prime_edt(epan_dissect_t *edt)
}
/* Colorize a single packet of the packet list (old packet list)
* (row is only _U_ for the NEW_PACKET_LIST case
*
* Return the color_t for later use (new packet list) */
color_filter_t *
color_filters_colorize_packet(gint row _U_, epan_dissect_t *edt)
#ifdef NEW_PACKET_LIST
color_filters_colorize_packet(epan_dissect_t *edt)
#else
color_filters_colorize_packet(gint row, epan_dissect_t *edt)
#endif
{
GSList *curr;
color_filter_t *colorf;

30
color_filters.h
View File

@ -31,19 +31,19 @@
/* Data for a color filter. */
typedef struct _color_filter {
gchar *filter_name; /* name of the filter */
gchar *filter_text; /* text of the filter expression */
color_t bg_color; /* background color for packets that match */
color_t fg_color; /* foreground color for packets that match */
gboolean disabled; /* set if the filter is disabled */
gboolean selected; /* set if the filter is selected in the color dialog box */
gchar *filter_name; /* name of the filter */
gchar *filter_text; /* text of the filter expression */
color_t bg_color; /* background color for packets that match */
color_t fg_color; /* foreground color for packets that match */
gboolean disabled; /* set if the filter is disabled */
gboolean selected; /* set if the filter is selected in the color dialog box */
/* only used inside of color_filters.c */
dfilter_t *c_colorfilter; /* compiled filter expression */
/* only used inside of color_filters.c */
dfilter_t *c_colorfilter; /* compiled filter expression */
/* only used outside of color_filters.c (beside init) */
void *edit_dialog; /* if filter is being edited, dialog
* box for it */
/* only used outside of color_filters.c (beside init) */
void *edit_dialog; /* if filter is being edited, dialog
* box for it */
} color_filter_t;
@ -91,7 +91,7 @@ void
color_filters_reset_tmp(void);
/* Prime the epan_dissect_t with all the compiler
* color filters of the current filter list.
* color filters of the current filter list.
*
* @param the epan dissector details
*/
@ -104,9 +104,11 @@ void color_filters_prime_edt(epan_dissect_t *edt);
* @return the matching color filter or NULL
*/
color_filter_t *
#ifdef NEW_PACKET_LIST
color_filters_colorize_packet(epan_dissect_t *edt);
#else
color_filters_colorize_packet(gint row, epan_dissect_t *edt);
#endif
/** Clone the currently active filter list.
*

2
gtk/packet_list_store.c
View File

@ -989,7 +989,7 @@ packet_list_dissect_and_cache_by_record(PacketList *packet_list, PacketListRecor
epan_dissect_run(&edt, &cfile.pseudo_header, cfile.pd, fdata, cinfo);
if (dissect_color)
fdata->color_filter = color_filters_colorize_packet(0 /* row - unused */, &edt);
fdata->color_filter = color_filters_colorize_packet(&edt);
if (dissect_columns) {
/* "Stringify" non frame_data vals */