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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44438 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 2 insertions, 2 deletions

diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index f5978682e2..3c4c5c1773 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -2634,7 +2634,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 		if(check_col(pinfo->cinfo, COL_INFO)){
 			col_append_str(pinfo->cinfo, COL_INFO,
-				val_to_str(svcaction, scsi_osd_svcaction_vals, "Unknown OSD Serviceaction"));
+				val_to_str_const(svcaction, scsi_osd_svcaction_vals, "Unknown OSD Serviceaction"));
 		}
 		dissector=find_svcaction_dissector(svcaction);
 		if(dissector){
@@ -2652,7 +2652,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	}
 	if(check_col(pinfo->cinfo, COL_INFO)){
 		col_append_str(pinfo->cinfo, COL_INFO,
-			val_to_str(svcaction, scsi_osd_svcaction_vals, "Unknown OSD Serviceaction"));
+			val_to_str_const(svcaction, scsi_osd_svcaction_vals, "Unknown OSD Serviceaction"));
 	}
 	if(svcaction){
 		proto_item *it;