From 3ea940979221e6775f1851e3b43a1bea69271fb2 Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Mon, 21 Sep 2009 18:48:53 +0000 Subject: Store 'color_filter' as const in 'frame_data' svn path=/trunk/; revision=30051 --- color_filters.c | 2 +- color_filters.h | 2 +- epan/dissectors/packet-frame.c | 2 +- epan/frame_data.h | 2 +- gtk/new_packet_list.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/color_filters.c b/color_filters.c index 28297e198b..f24d177d05 100644 --- a/color_filters.c +++ b/color_filters.c @@ -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 diff --git a/color_filters.h b/color_filters.h index 07050041a8..6ee0b11c91 100644 --- a/color_filters.h +++ b/color_filters.h @@ -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 diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 433208ac57..b461397f26 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -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); diff --git a/epan/frame_data.h b/epan/frame_data.h index f59a503cc0..5d4fa8f4ee 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -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) */ diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index a33140af45..11646795e1 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -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; -- cgit v1.2.3