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

Store 'color_filter' as const in 'frame_data' 

svn path=/trunk/; revision=30051
This commit is contained in:
Kovarththanan Rajaratnam 2009-09-21 18:48:53 +00:00
parent da5b43c80c
commit 3ea9409792
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
color_filters.c
View File

@ -441,7 +441,7 @@ color_filters_prime_edt(epan_dissect_t *edt)
/* Colorize a single packet of the packet list (old packet list)
*
* Return the color_t for later use (new packet list) */
color_filter_t *
const color_filter_t *
#ifdef NEW_PACKET_LIST
color_filters_colorize_packet(epan_dissect_t *edt)
#else

2
color_filters.h
View File

@ -103,7 +103,7 @@ void color_filters_prime_edt(epan_dissect_t *edt);
* @param edt the dissected packet
* @return the matching color filter or NULL
*/
color_filter_t *
const color_filter_t *
#ifdef NEW_PACKET_LIST
color_filters_colorize_packet(epan_dissect_t *edt);
#else

2
epan/dissectors/packet-frame.c
View File

@ -302,7 +302,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
if(pinfo->fd->color_filter != NULL) {
color_filter_t *color_filter = pinfo->fd->color_filter;
const color_filter_t *color_filter = pinfo->fd->color_filter;
item = proto_tree_add_string(fh_tree, hf_frame_color_filter_name, tvb,
0, 0, color_filter->filter_name);
PROTO_ITEM_SET_GENERATED(item);

2
epan/frame_data.h
View File

@ -54,7 +54,7 @@ typedef struct _frame_data {
unsigned int ref_time : 1; /* 1 = marked as a reference time frame, 0 = normal */
} flags;
void *color_filter; /* Per-packet matching color_filter_t object */
const void *color_filter; /* Per-packet matching color_filter_t object */
nstime_t abs_ts; /* Absolute timestamp */
nstime_t rel_ts; /* Relative timestamp (yes, it can be negative) */

2
gtk/new_packet_list.c
View File

@ -692,7 +692,7 @@ show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer,
}else{
color_t fg_color_t;
color_t bg_color_t;
color_filter_t *color_filter = fdata->color_filter;
const color_filter_t *color_filter = fdata->color_filter;
fg_color_t = color_filter->fg_color;
bg_color_t = color_filter->bg_color;