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

Put the number of fragments/segments in front of the element to avoid 

conflict when they are named fragments instead of segments and to avoid
duplicating the fragments/segments text.

svn path=/trunk/; revision=34074
This commit is contained in:
Stig Bjørlykke 2010-09-07 20:40:39 +00:00
parent f18fe680e4
commit 79ec447f8b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/reassemble.c
View File

@ -1968,11 +1968,13 @@ show_fragment(fragment_data *fd, const int offset, const fragment_items *fit,
proto_item *fei=NULL;
int hf;
if (first_frag)
proto_item_append_text(fi, " (%u segment%s, %u byte%s): ", count, plurality(count, "", "s"), tvb_length(tvb),
if (first_frag) {
proto_item_prepend_text(fi, "%u ", count);
proto_item_append_text(fi, " (%u byte%s): ", tvb_length(tvb),
plurality(tvb_length(tvb), "", "s"));
else
} else {
proto_item_append_text(fi, ", ");
}
proto_item_append_text(fi, "#%u(%u)", fd->frame, fd->len);
if (fd->flags & (FD_OVERLAPCONFLICT