diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-04-12 15:26:34 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-04-12 22:27:22 +0000 |
commit | cb16dff992c3844936bf5829f19e5a5247458503 (patch) | |
tree | 901b7be3379f5b94f150de71d1c0f3e2fa2d12e4 /rawshark.c | |
parent | ef8a0a2ce172810d48371eb65c73b1bd4a6303ca (diff) |
Get rid of more tvb_get_nstringz* calls.
Add an FT_STRINGZPAD type, for null-padded strings (typically
fixed-length fields, where the string can be up to the length of the
field, and is null-padded if it's shorter than that), and use it. Use
IS_FT_STRING() in more cases, so that less code needs to know what types
are string types.
Add a tvb_get_stringzpad() routine, which gets null-padded strings.
Currently, it does the same thing that tvb_get_string_enc() does, but
that might change if we don't store string values as null-terminated
strings.
Change-Id: I46f56e130de8f419a19b56ded914e24cc7518a66
Reviewed-on: https://code.wireshark.org/review/1082
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'rawshark.c')
-rw-r--r-- | rawshark.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rawshark.c b/rawshark.c index f68941beda..54fc338f10 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1256,6 +1256,8 @@ static const char* ftenum_to_string(header_field_info *hfi) return "FT_REL_OID"; case FT_SYSTEM_ID: return "FT_SYSTEM_ID"; + case FT_STRINGZPAD: + return "FT_STRIGZPAD"; case FT_NUM_TYPES: return "FT_NUM_TYPES"; default: @@ -1343,7 +1345,7 @@ static gboolean print_field_value(field_info *finfo, int cmd_line_index) fs_buf); /* String types are quoted. Remove them. */ - if ((finfo->value.ftype->ftype == FT_STRING || finfo->value.ftype->ftype == FT_STRINGZ) && fs_len > 2) { + if (IS_FT_STRING(finfo->value.ftype->ftype) && fs_len > 2) { fs_buf[fs_len - 1] = '\0'; fs_ptr++; } |