aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-20 23:20:45 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2009-03-20 23:20:45 +0000
commit28cb065b92d4359a1217aa1353469eabbdfa17ec (patch)
tree8c8fcf3aa09a3981b9fd58f8f8fbfc703fb1be6c /epan/dissectors
parent423eea1780e658bbfb1e7b7c854ca9b84180429d (diff)
proto_item_append_string() actually appends to the string value for a
protocol tree item; the item being added to isn't a string, so proto_item_append_text() should be used - but the second argument to proto_item_append_text() should always be a format string. Use #if 0/#endif to leave a data structure in the source code without compiling it in, rather than a comment (if you use a comment, things can break if you put a comment into the commented-out code). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27811 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-nas_eps.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index 276abbb61f..ca356306d5 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -794,7 +794,7 @@ de_emm_nas_key_set_id_bits(tvbuff_t *tvb, proto_tree *tree, guint32 bit_offset,
/* NAS key set identifier (octet 1) */
item = proto_tree_add_bits_item(tree, hf_nas_eps_emm_nas_key_set_id, tvb, bit_offset, 3, FALSE);
if(add_string){
- proto_item_append_string(item, add_string);
+ proto_item_append_text(item, "%s", add_string);
}
bit_offset+=3;
}
@@ -1207,7 +1207,7 @@ The coding of the value part of the LCS client identity is given in subclause 17
* 9.9.4.3 EPS quality of service
* 9.9.4.4 ESM cause
*/
-/*
+#if 0
static const value_string nas_eps_esm_cause_vals[] = {
{ 0, ""},
{ 0x08, "Operator Determined Barring"},
@@ -1251,7 +1251,8 @@ static const value_string nas_eps_esm_cause_vals[] = {
{ 0x6f, "Protocol error, unspecified"},
{ 0x70, "APN restriction value incompatible with active EPS bearer context"},
{ 0, NULL }
-}; */
+};
+#endif
/*
* 9.9.4.5 ESM information transfer flag