diff options
Diffstat (limited to 'epan/dissectors/asn1/ftam')
| -rw-r--r-- | epan/dissectors/asn1/ftam/ftam.cnf | 8 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ftam/packet-ftam-template.c | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/epan/dissectors/asn1/ftam/ftam.cnf b/epan/dissectors/asn1/ftam/ftam.cnf index 5f538328..7ed79604 100644 --- a/epan/dissectors/asn1/ftam/ftam.cnf +++ b/epan/dissectors/asn1/ftam/ftam.cnf @@ -114,7 +114,7 @@ Legal-Qualification-Attribute/actual-values ABBREV=actual_values9 /* XXX have no idea about this one */ #.FN_BODY FTAM-Regime-PDU VAL_PTR = &branch_taken - gint branch_taken; + int branch_taken; %(DEFAULT_BODY)s @@ -123,7 +123,7 @@ Legal-Qualification-Attribute/actual-values ABBREV=actual_values9 } #.FN_BODY File-PDU VAL_PTR = &branch_taken - gint branch_taken; + int branch_taken; %(DEFAULT_BODY)s @@ -132,7 +132,7 @@ Legal-Qualification-Attribute/actual-values ABBREV=actual_values9 } #.FN_BODY Bulk-Data-PDU VAL_PTR = &branch_taken - gint branch_taken; + int branch_taken; %(DEFAULT_BODY)s @@ -141,7 +141,7 @@ Legal-Qualification-Attribute/actual-values ABBREV=actual_values9 } #.FN_BODY FSM-PDU VAL_PTR = &branch_taken - gint branch_taken; + int branch_taken; %(DEFAULT_BODY)s diff --git a/epan/dissectors/asn1/ftam/packet-ftam-template.c b/epan/dissectors/asn1/ftam/packet-ftam-template.c index 5d88c6fe..2b4d0bc0 100644 --- a/epan/dissectors/asn1/ftam/packet-ftam-template.c +++ b/epan/dissectors/asn1/ftam/packet-ftam-template.c @@ -20,6 +20,7 @@ #include <epan/expert.h> #include <epan/oids.h> #include <epan/asn1.h> +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-acse.h" @@ -33,20 +34,20 @@ void proto_register_ftam(void); void proto_reg_handoff_ftam(void); /* Initialize the protocol and registered fields */ -static int proto_ftam = -1; +static int proto_ftam; /* Declare the function to avoid a compiler warning */ static int dissect_ftam_OR_Set(bool implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); -static int hf_ftam_unstructured_text = -1; /* ISO FTAM unstructured text */ -static int hf_ftam_unstructured_binary = -1; /* ISO FTAM unstructured binary */ +static int hf_ftam_unstructured_text; /* ISO FTAM unstructured text */ +static int hf_ftam_unstructured_binary; /* ISO FTAM unstructured binary */ #include "packet-ftam-hf.c" /* Initialize the subtree pointers */ -static gint ett_ftam = -1; +static int ett_ftam; #include "packet-ftam-ett.c" -static expert_field ei_ftam_zero_pdu = EI_INIT; +static expert_field ei_ftam_zero_pdu; #include "packet-ftam-fn.c" @@ -82,7 +83,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d proto_tree *tree=NULL; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); if(parent_tree){ item = proto_tree_add_item(parent_tree, proto_ftam, tvb, 0, -1, ENC_NA); @@ -93,7 +94,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; - offset=dissect_ftam_PDU(FALSE, tvb, offset, &asn1_ctx, tree, -1); + offset=dissect_ftam_PDU(false, tvb, offset, &asn1_ctx, tree, -1); if(offset == old_offset){ proto_tree_add_expert(tree, pinfo, &ei_ftam_zero_pdu, tvb, offset, -1); break; @@ -119,7 +120,7 @@ void proto_register_ftam(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_ftam, #include "packet-ftam-ettarr.c" }; |