osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Un-shadow a couple of variables. 

svn path=/trunk/; revision=49317
This commit is contained in:
Gerald Combs 2013-05-15 17:49:45 +00:00
parent ac3957c4cd
commit 6b0c550696
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,11 +417,11 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
pinfo->layer_names = NULL;
if(pinfo->fd->pfd != 0){
proto_item *item;
proto_item *ppd_item;
guint num_entries = g_slist_length(pinfo->fd->pfd);
guint i;
item = proto_tree_add_uint(fh_tree, hf_frame_num_p_prot_data, tvb, 0, 0, num_entries);
PROTO_ITEM_SET_GENERATED(item);
ppd_item = proto_tree_add_uint(fh_tree, hf_frame_num_p_prot_data, tvb, 0, 0, num_entries);
PROTO_ITEM_SET_GENERATED(ppd_item);
for(i=0; i<num_entries; i++){
proto_tree_add_text (fh_tree, tvb, 0, 0, "%s",p_get_proto_name_and_key(pinfo->fd, i));
}

4
epan/frame_data.c
View File

@ -120,10 +120,10 @@ p_remove_proto_data(frame_data *fd, int proto, guint8 key)
}
gchar *
p_get_proto_name_and_key(frame_data *fd, guint index){
p_get_proto_name_and_key(frame_data *fd, guint pfd_index){
frame_proto_data *temp;
temp = (frame_proto_data*)g_slist_nth_data(fd->pfd, index);
temp = (frame_proto_data*)g_slist_nth_data(fd->pfd, pfd_index);
return ep_strdup_printf("[%s, key %u]",proto_get_protocol_name(temp->proto), temp->key);

2
epan/frame_data.h
View File

@ -93,7 +93,7 @@ typedef struct {
WS_DLL_PUBLIC void p_add_proto_data(frame_data *fd, int proto, guint8 key, void *proto_data);
WS_DLL_PUBLIC void *p_get_proto_data(frame_data *fd, int proto, guint8 key);
void p_remove_proto_data(frame_data *fd, int proto, guint8 key);
gchar *p_get_proto_name_and_key(frame_data *fd, guint index);
gchar *p_get_proto_name_and_key(frame_data *fd, guint pfd_index);
/** compare two frame_datas */
WS_DLL_PUBLIC gint frame_data_compare(const frame_data *fdata1, const frame_data *fdata2, int field);