diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-21 20:48:30 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-21 20:48:30 +0000 |
| commit | 5d52e1673483c6ed146ced3c7c086594c0a484ac (patch) | |
| tree | 88ca0347d8bbadce7fd02036e5b5a2c34887ac31 /ui/gtk/packet_list_store.c | |
| parent | a66a717d46af19111dbde3dc9e72a2bd32734692 (diff) | |
Add helper function to epan_session which can be used to get absolute timestamp of given frame.
Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number.
This patch reduce size of frame_data by 8B (amd64)
This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13)
svn path=/trunk/; revision=50765
Diffstat (limited to 'ui/gtk/packet_list_store.c')
| -rw-r--r-- | ui/gtk/packet_list_store.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index e7cb64bef8..4aeca56045 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -935,7 +935,7 @@ packet_list_compare_custom(gint sort_id, gint text_sort_id, PacketListRecord *a, hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[sort_id]); if (hfi == NULL) { - return frame_data_compare(a->fdata, b->fdata, COL_NUMBER); + return frame_data_compare(cfile.epan, a->fdata, b->fdata, COL_NUMBER); } else if ((hfi->strings == NULL) && (((IS_FT_INT(hfi->type) || IS_FT_UINT(hfi->type)) && ((hfi->display == BASE_DEC) || (hfi->display == BASE_DEC_HEX) || @@ -982,11 +982,11 @@ packet_list_compare_records(gint sort_id, gint text_sort_id, PacketListRecord *a gint ret; if (text_sort_id == -1) /* based on frame_data ? */ - return frame_data_compare(a->fdata, b->fdata, cfile.cinfo.col_fmt[sort_id]); + return frame_data_compare(cfile.epan, a->fdata, b->fdata, cfile.cinfo.col_fmt[sort_id]); ret = _packet_list_compare_records(sort_id, text_sort_id, a, b); if (ret == 0) - ret = frame_data_compare(a->fdata, b->fdata, COL_NUMBER); + ret = frame_data_compare(cfile.epan, a->fdata, b->fdata, COL_NUMBER); return ret; } |