diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-05-18 17:17:08 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-05-18 17:17:08 +0000 |
| commit | b9a1e3fb2a182b9680d5a785f2ce56021ab02176 (patch) | |
| tree | 3c4dc208a769a6f5710fb5e804acef7cacfbd489 /epan/dissectors/packet-gsm_sms.c | |
| parent | 7b3bd3e8a9b5f347f5c41fc4bca5e1b8cff02c2d (diff) | |
Do PROTO_ITEM_SET_GENERATED for two 'proto_item *': Fixes Coverity 914 & 915 [UNUSED]
svn path=/trunk/; revision=37245
Diffstat (limited to 'epan/dissectors/packet-gsm_sms.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_sms.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index 8709d954f5..e0eee73df5 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -39,7 +39,6 @@ # include "config.h" #endif -#include <stdlib.h> #include <gmodule.h> #ifdef HAVE_SYS_TYPES_H @@ -2778,11 +2777,13 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb } else length_ucs2 = len_sms % MAX_SMS_FRAG_LEN; - /* XXX - using proto_tree_add_string() doesn't work */ - ucs2_item = proto_tree_add_string_format_value(subtree, hf_gsm_sms_text, sm_tvb, - i * MAX_SMS_FRAG_LEN, length_ucs2, - &utf8_text[i * MAX_SMS_FRAG_LEN], - "%s", &utf8_text[i * MAX_SMS_FRAG_LEN]); + /* XXX - using proto_tree_add_string() doesn't work */ + ucs2_item = proto_tree_add_string_format_value(subtree, hf_gsm_sms_text, sm_tvb, + i * MAX_SMS_FRAG_LEN, length_ucs2, + &utf8_text[i * MAX_SMS_FRAG_LEN], + "%s", &utf8_text[i * MAX_SMS_FRAG_LEN]); + PROTO_ITEM_SET_GENERATED(ucs2_item); + /* return the save byte to utf8 buffer*/ if(i * MAX_SMS_FRAG_LEN < len_sms) { utf8_text[i * MAX_SMS_FRAG_LEN] = save_byte; @@ -2791,6 +2792,7 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb } } else { ucs2_item = proto_tree_add_text(subtree, tvb, offset, length, "Failed to decode UCS2!"); + PROTO_ITEM_SET_GENERATED(ucs2_item); } } |