From 5312d37e93f470ca2fa241ad2242f1af8ae34587 Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Thu, 4 Apr 2013 21:01:27 +0000
Subject: [PATCH] Update ASN.1 conformance files with the changes from r48634

svn path=/trunk/; revision=48741
---
 asn1/h282/h282.cnf |  6 +++---
 asn1/h283/h283.cnf | 12 ++++++------
 asn1/h501/h501.cnf |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/asn1/h282/h282.cnf b/asn1/h282/h282.cnf
index 0ca7e55a14..1e818829f9 100644
--- a/asn1/h282/h282.cnf
+++ b/asn1/h282/h282.cnf
@@ -24,7 +24,7 @@ NonCollapsingCapabilities
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h282_RequestPDU_vals));
+  p = try_val_to_str(msg_type, VALS(h282_RequestPDU_vals));
   if (p)
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RequestPDU/%s", p);
 #.END
@@ -35,7 +35,7 @@ NonCollapsingCapabilities
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h282_ResponsePDU_vals));
+  p = try_val_to_str(msg_type, VALS(h282_ResponsePDU_vals));
   if (p)
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "ResponsePDU/%s", p);
 #.END
@@ -46,7 +46,7 @@ NonCollapsingCapabilities
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h282_IndicationPDU_vals));
+  p = try_val_to_str(msg_type, VALS(h282_IndicationPDU_vals));
   if (p)
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "IndicationPDU/%s", p);
 #.END
diff --git a/asn1/h283/h283.cnf b/asn1/h283/h283.cnf
index a08b739433..6c9f1d0f9a 100644
--- a/asn1/h283/h283.cnf
+++ b/asn1/h283/h283.cnf
@@ -19,7 +19,7 @@ LCTPDU
   gint32 pdu_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(pdu_type, VALS(h283_T_pduType_vals));
+  p = try_val_to_str(pdu_type, VALS(h283_T_pduType_vals));
   if (!info_is_set && p ) {
     col_set_str(actx->pinfo->cinfo, COL_INFO, p);
     info_is_set = TRUE;
@@ -32,7 +32,7 @@ LCTPDU
   gint32 data_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(data_type, VALS(h283_T_dataType_vals));
+  p = try_val_to_str(data_type, VALS(h283_T_dataType_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RDCData/%s", p);
     info_is_set = TRUE;
@@ -45,7 +45,7 @@ LCTPDU
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h283_LCTMessage_vals));
+  p = try_val_to_str(msg_type, VALS(h283_LCTMessage_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTMessage/%s", p);
     info_is_set = TRUE;
@@ -58,7 +58,7 @@ LCTPDU
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h283_LCTRequest_vals));
+  p = try_val_to_str(msg_type, VALS(h283_LCTRequest_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTRequest/%s", p);
     info_is_set = TRUE;
@@ -71,7 +71,7 @@ LCTPDU
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h283_LCTResponse_vals));
+  p = try_val_to_str(msg_type, VALS(h283_LCTResponse_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTResponse/%s", p);
     info_is_set = TRUE;
@@ -84,7 +84,7 @@ LCTPDU
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h283_LCTIndication_vals));
+  p = try_val_to_str(msg_type, VALS(h283_LCTIndication_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTIndication/%s", p);
     info_is_set = TRUE;
diff --git a/asn1/h501/h501.cnf b/asn1/h501/h501.cnf
index 284dae4e15..fbaaa8f1c2 100644
--- a/asn1/h501/h501.cnf
+++ b/asn1/h501/h501.cnf
@@ -22,7 +22,7 @@ Message
   gint32 msg_type = -1;
   const gchar *p = NULL;
 #.FN_FTR
-  p = match_strval(msg_type, VALS(h501_MessageBody_vals));
+  p = try_val_to_str(msg_type, VALS(h501_MessageBody_vals));
   if (p )
     col_set_str(actx->pinfo->cinfo, COL_INFO, p);
 #.END