diff options
| author | Guy Harris <guy@alum.mit.edu> | 2006-11-21 21:49:58 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2006-11-21 21:49:58 +0000 |
| commit | b343fcddd90f6aa860d5addd4ced2ef6317f4860 (patch) | |
| tree | d956249bad8db37acc36fb61fead6e63ce4d61ef /epan/reassemble.c | |
| parent | 2b66ba96042460a21dd96176224def54a0e7cad1 (diff) | |
Fix pluralization of "bytes" so it doesn't say "1 bytes".
Clean up indentation.
svn path=/trunk/; revision=19953
Diffstat (limited to 'epan/reassemble.c')
| -rw-r--r-- | epan/reassemble.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c index 39e9a42b3e..22273a2c24 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -819,8 +819,8 @@ fragment_add_common(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, gboolean already_added=pinfo->fd->flags.visited; - /* dissector shouldn't give us garbage tvb info */ - DISSECTOR_ASSERT(tvb_bytes_exist(tvb, offset, frag_data_len)); + /* dissector shouldn't give us garbage tvb info */ + DISSECTOR_ASSERT(tvb_bytes_exist(tvb, offset, frag_data_len)); /* create key to search hash with */ key.src = pinfo->src; @@ -1780,7 +1780,8 @@ show_fragment(fragment_data *fd, int offset, const fragment_items *fit, int hf; if (first_frag) - proto_item_append_text(fi, " (%u bytes): ", tvb_length(tvb)); + proto_item_append_text(fi, " (%u byte%s): ", tvb_length(tvb), + plurality(tvb_length(tvb), "", "s")); else proto_item_append_text(fi, ", "); proto_item_append_text(fi, "#%u(%u)", fd->frame, fd->len); @@ -1801,11 +1802,12 @@ show_fragment(fragment_data *fd, int offset, const fragment_items *fit, fei = proto_tree_add_uint_format(ft, hf, tvb, offset, fd->len, fd->frame, - "Frame: %u, payload: %u-%u (%u bytes)", + "Frame: %u, payload: %u-%u (%u byte%s)", fd->frame, offset, offset+fd->len-1, - fd->len); + fd->len, + plurality(fd->len, "", "s")); } PROTO_ITEM_SET_GENERATED(fei); if (fd->flags & (FD_OVERLAP|FD_OVERLAPCONFLICT |