Use val_to_str_const() where appropriate;

Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc

svn path=/trunk/; revision=44438

1 files changed, 2 insertions, 2 deletions

diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c
index 765232a70c..78b4cc0aa6 100644
--- a/epan/dissectors/packet-bt-dht.c
+++ b/epan/dissectors/packet-bt-dht.c
@@ -392,9 +392,9 @@ dissect_bencoded_dict_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   }
 
   if( strlen(key)==1 )
-    key = (char*)val_to_str( key[0], short_key_name_value_string, key );
+    key = (char*)val_to_str_const( key[0], short_key_name_value_string, key );
   if( strlen(val)==1 )
-    val = (char*)val_to_str( val[0], short_val_name_value_string, val );
+    val = (char*)val_to_str_const( val[0], short_val_name_value_string, val );
 
   proto_item_set_text( ti, "%s: %s", key, val );
   proto_item_set_len( ti, offset-orig_offset );