Use extended value string functions to access dce_error_vals (which has 4397 entries)

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

1 files changed, 13 insertions, 13 deletions

diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c
index 0643383a46..72b23be301 100644
--- a/epan/dissectors/packet-dcerpc-conv.c
+++ b/epan/dissectors/packet-dcerpc-conv.c
@@ -76,7 +76,7 @@ conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset,
               actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1],
               actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
         }
-	        
+
 	return offset;
 }
 
@@ -93,11 +93,11 @@ conv_dissect_who_are_you_resp (tvbuff_t *tvb, int offset,
 
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_resp_seq, &seq);
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
-	
+
 
        if (check_col(pinfo->cinfo, COL_INFO)) {
-         col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you response seq:%u st:%s", 
-               seq, val_to_str(st, dce_error_vals, "%u")); 
+         col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you response seq:%u st:%s",
+               seq, val_to_str_ext(st, &dce_error_vals_ext, "%u"));
        }
 
        return offset;
@@ -125,7 +125,7 @@ conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset,
                  actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1],
                  actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
         }
-	        
+
 	return offset;
 }
 static int
@@ -136,7 +136,7 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset,
 	/*
 	 *         [out]   unsigned32      *seq,
 	 *         [out]   uuid_t          *cas_uuid,
-	 *                  
+	 *
 	 *         [out]   unsigned32      *st
 	 */
        guint32 seq, st;
@@ -147,11 +147,11 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset,
        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
 
        if (check_col(pinfo->cinfo, COL_INFO)) {
-         col_add_fstr(pinfo->cinfo, COL_INFO, 
-               "conv_who_are_you2 response seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", 
-                seq, val_to_str(st, dce_error_vals, "%u"), 
+         col_add_fstr(pinfo->cinfo, COL_INFO,
+               "conv_who_are_you2 response seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                seq, val_to_str_ext(st, &dce_error_vals_ext, "%u"),
                 cas_uuid.Data1, cas_uuid.Data2, cas_uuid.Data3, cas_uuid.Data4[0], cas_uuid.Data4[1],
-                cas_uuid.Data4[2], cas_uuid.Data4[3], cas_uuid.Data4[4], cas_uuid.Data4[5], cas_uuid.Data4[6], cas_uuid.Data4[7]); 
+                cas_uuid.Data4[2], cas_uuid.Data4[3], cas_uuid.Data4[4], cas_uuid.Data4[5], cas_uuid.Data4[6], cas_uuid.Data4[7]);
         }
 
 	return offset;
@@ -159,9 +159,9 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset,
 
 
 static dcerpc_sub_dissector conv_dissectors[] = {
-    { 0, "who_are_you", 
+    { 0, "who_are_you",
           conv_dissect_who_are_you_rqst, conv_dissect_who_are_you_resp },
-    { 1, "who_are_you2", 
+    { 1, "who_are_you2",
           conv_dissect_who_are_you2_rqst, conv_dissect_who_are_you2_resp },
     { 2, "are_you_there", NULL, NULL },
     { 3, "who_are_you_auth", NULL, NULL },
@@ -176,7 +176,7 @@ proto_register_conv (void)
         { &hf_conv_opnum,
             { "Operation", "conv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_conv_rc,
-            {"Status", "conv.status", FT_UINT32, BASE_DEC, VALS(dce_error_vals), 0x0, NULL, HFILL }},
+            {"Status", "conv.status", FT_UINT32, BASE_DEC|BASE_EXT_STRING, &dce_error_vals_ext, 0x0, NULL, HFILL }},
 
         { &hf_conv_who_are_you_rqst_actuid,
             {"Activity UID", "conv.who_are_you_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }},