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

Remove remnants of bygone GTK era

This commit is contained in:
Jaap Keuter 2021-12-22 06:02:10 +00:00 committed by Wireshark GitLab Utility
parent 6a74dae750
commit 6fa56bca0c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/proto.c
View File

@ -7592,13 +7592,6 @@ proto_get_next_protocol(void **cookie)
return protocol->proto_id;
}
/* XXX: Unfortunately certain functions in proto_hier_tree_model.c
assume that the cookie stored by
proto_get_(first|next)_protocol_field() will never have a
value of NULL. So, to preserve this semantic, the cookie value
below is adjusted so that the cookie value stored is 1 + the
current (zero-based) array index.
*/
header_field_info *
proto_get_first_protocol_field(const int proto_id, void **cookie)
{
@ -7607,7 +7600,7 @@ proto_get_first_protocol_field(const int proto_id, void **cookie)
if ((protocol == NULL) || (protocol->fields == NULL) || (protocol->fields->len == 0))
return NULL;
*cookie = GUINT_TO_POINTER(0 + 1);
*cookie = GUINT_TO_POINTER(0);
return (header_field_info *)g_ptr_array_index(protocol->fields, 0);
}
@ -7615,14 +7608,14 @@ header_field_info *
proto_get_next_protocol_field(const int proto_id, void **cookie)
{
protocol_t *protocol = find_protocol_by_id(proto_id);
guint i = GPOINTER_TO_UINT(*cookie) - 1;
guint i = GPOINTER_TO_UINT(*cookie);
i++;
if ((protocol->fields == NULL) || (i >= protocol->fields->len))
return NULL;
*cookie = GUINT_TO_POINTER(i + 1);
*cookie = GUINT_TO_POINTER(i);
return (header_field_info *)g_ptr_array_index(protocol->fields, i);
}