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

From Jakub Zawadzki via bug 5809: 

Compare frame number when columns are equal.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36532 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
stig 2011-04-09 19:03:04 +00:00
parent c42cc1f153
commit 674c2468b3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/packet_list_store.c
View File

@ -971,12 +971,9 @@ packet_list_compare_custom(gint sort_id, PacketListRecord *a, PacketListRecord *
}
static gint
packet_list_compare_records(gint sort_id, PacketListRecord *a,
_packet_list_compare_records(gint sort_id, PacketListRecord *a,
PacketListRecord *b)
{
if (col_based_on_frame_data(&cfile.cinfo, sort_id))
return frame_data_compare(a->fdata, b->fdata, cfile.cinfo.col_fmt[sort_id]);
g_assert(a->fdata->col_text);
g_assert(b->fdata->col_text);
g_assert(a->fdata->col_text[sort_id]);
@ -991,6 +988,21 @@ packet_list_compare_records(gint sort_id, PacketListRecord *a,
return strcmp(a->fdata->col_text[sort_id], b->fdata->col_text[sort_id]);
}
static gint
packet_list_compare_records(gint sort_id, PacketListRecord *a,
PacketListRecord *b)
{
gint ret;
if (col_based_on_frame_data(&cfile.cinfo, sort_id))
return frame_data_compare(a->fdata, b->fdata, cfile.cinfo.col_fmt[sort_id]);
ret = _packet_list_compare_records(sort_id, a, b);
if (ret == 0)
ret = a->fdata->num - b->fdata->num;
return ret;
}
static gint
packet_list_qsort_physical_compare_func(PacketListRecord **a, PacketListRecord **b,
PacketList *packet_list)