diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-06-26 10:52:37 -0400 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-27 15:20:06 +0000 |
| commit | 2ab415579491e4bc66ea58627bda504cae833b9e (patch) | |
| tree | 0f7f8eaa4bd9d90c8f6066036522ef0fc65d137d /epan/dissectors/packet-rtps.c | |
| parent | 8c37621ca733a24a972e3e069a537c06e650f435 (diff) | |
| download | wireshark-2ab415579491e4bc66ea58627bda504cae833b9e.tar.gz | |
tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_string
Also some other tricks to remove unnecessary tvb_get_string_enc calls.
Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914
Reviewed-on: https://code.wireshark.org/review/16158
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rtps.c')
| -rw-r--r-- | epan/dissectors/packet-rtps.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index df58366d96..8d6664fe8d 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -2162,12 +2162,9 @@ gint rtps_util_add_string(proto_tree *tree, tvbuff_t *tvb, gint offset, guint8 *retVal = NULL; guint32 size = NEXT_guint32(tvb, offset, little_endian); - if (size > 0) { - retVal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII); - } + retVal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII); - proto_tree_add_string(tree, hf_item, tvb, offset, size+4, - (size == 0) ? (const guint8 *)"" : retVal); + proto_tree_add_string(tree, hf_item, tvb, offset, size+4, retVal); /* NDDS align strings at 4-bytes word. So: * string_length: 4 -> buffer_length = 4; @@ -2297,11 +2294,7 @@ gint rtps_util_add_seq_string(proto_tree *tree, tvbuff_t *tvb, gint offset, for (i = 0; i < num_strings; ++i) { size = NEXT_guint32(tvb, offset, little_endian); - if (size > 0) { - retVal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII); - } else { - retVal = (const guint8 *)""; - } + retVal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII); proto_tree_add_string_format(string_tree, hf_string, tvb, offset, size+4, retVal, "%s[%d]: %s", label, i, retVal); @@ -5279,11 +5272,7 @@ static gboolean dissect_parameter_sequence_v1(proto_tree *rtps_parameter_tree, p temp_offset = offset+4; while(seq_size-- > 0) { prop_size = NEXT_guint32(tvb, temp_offset, little_endian); - if (prop_size > 0) { - propName = tvb_get_string_enc(wmem_packet_scope(), tvb, temp_offset+4, prop_size, ENC_ASCII); - } else { - propName = (const guint8 *)""; - } + propName = tvb_get_string_enc(wmem_packet_scope(), tvb, temp_offset+4, prop_size, ENC_ASCII); /* NDDS align strings at 4-bytes word. */ str_length = (4 + ((prop_size + 3) & 0xfffffffc)); @@ -5292,11 +5281,7 @@ static gboolean dissect_parameter_sequence_v1(proto_tree *rtps_parameter_tree, p temp_offset += str_length; prop_size = NEXT_guint32(tvb, temp_offset, little_endian); - if (prop_size > 0) { - propValue = tvb_get_string_enc(wmem_packet_scope(), tvb, temp_offset+4, prop_size, ENC_ASCII); - } else { - propValue = (const guint8 *)""; - } + propValue = tvb_get_string_enc(wmem_packet_scope(), tvb, temp_offset+4, prop_size, ENC_ASCII); /* NDDS align strings at 4-bytes word. */ str_length = (4 + ((prop_size + 3) & 0xfffffffc)); |