Fix copy-and-paste error with cause value_strings, and change indentation to match...

Change-Id: I629f010f2430c5765c1adb41c57e6ea26d92b049
Reviewed-on: https://code.wireshark.org/review/1615
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 2d97b874137e3ff770f0e1820dd5390e2c64180b..cccdc9a38b14af0b2073fd98d08b88800e53658a 100644 (file)
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -1122,29 +1122,29 @@ UERadioCapabilityMatchResponse                  N s1ap.proc.sout id-UERadioCapabilityMatch
 /* Whenever a Cause appears, look up the reason and show it in the Info column */
    
 #.FN_BODY CauseRadioNetwork VAL_PTR=&value
-     guint32 value;
+  guint32 value;
 %(DEFAULT_BODY)s
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [RadioNetwork-cause=%%s]", val_to_str_const(value, s1ap_CauseMisc_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [RadioNetwork-cause=%%s]", val_to_str_const(value, s1ap_CauseRadioNetwork_vals, "Unknown"));
 
 #.FN_BODY CauseTransport VAL_PTR=&value
-     guint32 value;
+  guint32 value;
 %(DEFAULT_BODY)s
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Transport-cause=%%s]", val_to_str_const(value, s1ap_CauseTransport_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Transport-cause=%%s]", val_to_str_const(value, s1ap_CauseTransport_vals, "Unknown"));
 
 #.FN_BODY CauseNas VAL_PTR=&value
-     guint32 value;
+  guint32 value;
 %(DEFAULT_BODY)s
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, "  [NAS-cause=%%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "  [NAS-cause=%%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown"));
 
 #.FN_BODY CauseProtocol VAL_PTR=&value
-     guint32 value;
+  guint32 value;
 %(DEFAULT_BODY)s
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Protocol-cause=%%s]", val_to_str_const(value, s1ap_CauseProtocol_vals, "Unknown"));     
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Protocol-cause=%%s]", val_to_str_const(value, s1ap_CauseProtocol_vals, "Unknown"));     
 
 #.FN_BODY CauseMisc VAL_PTR=&value
-     guint32 value;
+  guint32 value;
 %(DEFAULT_BODY)s
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Misc-cause=%%s]", val_to_str_const(value, s1ap_CauseMisc_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Misc-cause=%%s]", val_to_str_const(value, s1ap_CauseMisc_vals, "Unknown"));
      
 
 #.TYPE_ATTR

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 81ff9445c5c172eef60624e55eb4e0d628497cfe..dd5aeaa483372616c340bbbc6a22641b265e6c07 100644 (file)
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -2499,11 +2499,11 @@ static value_string_ext s1ap_CauseRadioNetwork_vals_ext = VALUE_STRING_EXT_INIT(
 static int
 dissect_s1ap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 1125 "../../asn1/s1ap/s1ap.cnf"
-     guint32 value;
+  guint32 value;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      36, &value, TRUE, 3, NULL);
 
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [RadioNetwork-cause=%s]", val_to_str_const(value, s1ap_CauseMisc_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [RadioNetwork-cause=%s]", val_to_str_const(value, s1ap_CauseRadioNetwork_vals, "Unknown"));
 
 
 
@@ -2521,11 +2521,11 @@ const value_string s1ap_CauseTransport_vals[] = {
 static int
 dissect_s1ap_CauseTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 1130 "../../asn1/s1ap/s1ap.cnf"
-     guint32 value;
+  guint32 value;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, &value, TRUE, 0, NULL);
 
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Transport-cause=%s]", val_to_str_const(value, s1ap_CauseTransport_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Transport-cause=%s]", val_to_str_const(value, s1ap_CauseTransport_vals, "Unknown"));
 
 
 
@@ -2546,11 +2546,11 @@ const value_string s1ap_CauseNas_vals[] = {
 static int
 dissect_s1ap_CauseNas(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 1135 "../../asn1/s1ap/s1ap.cnf"
-     guint32 value;
+  guint32 value;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, &value, TRUE, 1, NULL);
 
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, "  [NAS-cause=%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "  [NAS-cause=%s]", val_to_str_const(value, s1ap_CauseNas_vals, "Unknown"));
 
 
 
@@ -2573,11 +2573,11 @@ const value_string s1ap_CauseProtocol_vals[] = {
 static int
 dissect_s1ap_CauseProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 1140 "../../asn1/s1ap/s1ap.cnf"
-     guint32 value;
+  guint32 value;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      7, &value, TRUE, 0, NULL);
 
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Protocol-cause=%s]", val_to_str_const(value, s1ap_CauseProtocol_vals, "Unknown"));     
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Protocol-cause=%s]", val_to_str_const(value, s1ap_CauseProtocol_vals, "Unknown"));     
 
 
 
@@ -2599,11 +2599,11 @@ const value_string s1ap_CauseMisc_vals[] = {
 static int
 dissect_s1ap_CauseMisc(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
 #line 1145 "../../asn1/s1ap/s1ap.cnf"
-     guint32 value;
+  guint32 value;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      6, &value, TRUE, 0, NULL);
 
-     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Misc-cause=%s]", val_to_str_const(value, s1ap_CauseMisc_vals, "Unknown"));
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Misc-cause=%s]", val_to_str_const(value, s1ap_CauseMisc_vals, "Unknown"));