diff options
Diffstat (limited to 'epan/dissectors/asn1/pcap')
| -rw-r--r-- | epan/dissectors/asn1/pcap/packet-pcap-template.c | 15 | ||||
| -rw-r--r-- | epan/dissectors/asn1/pcap/pcap.cnf | 7 |
2 files changed, 12 insertions, 10 deletions
diff --git a/epan/dissectors/asn1/pcap/packet-pcap-template.c b/epan/dissectors/asn1/pcap/packet-pcap-template.c index 535423ea..e13513e6 100644 --- a/epan/dissectors/asn1/pcap/packet-pcap-template.c +++ b/epan/dissectors/asn1/pcap/packet-pcap-template.c @@ -18,6 +18,7 @@ #include <epan/packet.h> #include <epan/prefs.h> +#include <wsutil/array.h> #include <epan/strutil.h> #include <epan/asn1.h> @@ -42,22 +43,22 @@ void proto_reg_handoff_pcap(void); #include "packet-pcap-val.h" -static dissector_handle_t pcap_handle = NULL; +static dissector_handle_t pcap_handle; /* Initialize the protocol and registered fields */ -static int proto_pcap = -1; +static int proto_pcap; #include "packet-pcap-hf.c" /* Initialize the subtree pointers */ -static int ett_pcap = -1; +static int ett_pcap; #include "packet-pcap-ett.c" /* Global variables */ -static guint32 ProcedureCode; -static guint32 ProtocolIE_ID; -/*static guint32 ProtocolExtensionID;*/ +static uint32_t ProcedureCode; +static uint32_t ProtocolIE_ID; +/*static uint32_t ProtocolExtensionID;*/ /* Dissector tables */ static dissector_table_t pcap_ies_dissector_table; @@ -144,7 +145,7 @@ void proto_register_pcap(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_pcap, #include "packet-pcap-ettarr.c" }; diff --git a/epan/dissectors/asn1/pcap/pcap.cnf b/epan/dissectors/asn1/pcap/pcap.cnf index 346471b0..5d517046 100644 --- a/epan/dissectors/asn1/pcap/pcap.cnf +++ b/epan/dissectors/asn1/pcap/pcap.cnf @@ -70,7 +70,8 @@ GANSS-PositioningInstructions/additionalAssistanceDataRequest ABBREV=gANSS-Posit #.FN_PARS ProtocolIE-ID VAL_PTR=&ProtocolIE_ID #.FN_FTR ProtocolIE-ID if (tree) { - proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &pcap_ProtocolIE_ID_vals_ext, "unknown (%d)")); + proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", + val_to_str_ext(ProtocolIE_ID, &pcap_ProtocolIE_ID_vals_ext, "unknown (%d)")); } #.END @@ -83,8 +84,8 @@ GANSS-PositioningInstructions/additionalAssistanceDataRequest ABBREV=gANSS-Posit #.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode #.FN_FTR ProcedureCode col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", - val_to_str(ProcedureCode, pcap_ProcedureCode_vals, - "unknown message")); + val_to_str_const(ProcedureCode, pcap_ProcedureCode_vals, + "unknown message")); #.END #.FN_PARS InitiatingMessage/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_InitiatingMessageValue |