diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-09-07 20:40:39 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-09-07 20:40:39 +0000 |
commit | 79ec447f8b7244f3ff8d07c622fb8d63f9efbe67 (patch) | |
tree | 2decb2e5975c0c2e3bf8f2a34b18c127cd7e1306 /epan/reassemble.c | |
parent | f18fe680e4d958e3589c27a24cbdd614edd190f0 (diff) |
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
Diffstat (limited to 'epan/reassemble.c')
-rw-r--r-- | epan/reassemble.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c index 4f2ae4d43c..6345be1769 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -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 |