diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/asn1/novell_pkis | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/novell_pkis')
| -rw-r--r-- | epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c b/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c index 5e0b9934..e739557d 100644 --- a/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c +++ b/epan/dissectors/asn1/novell_pkis/packet-novell_pkis-template.c @@ -15,6 +15,7 @@ #include <epan/oids.h> #include <epan/conversation.h> #include <epan/asn1.h> +#include <wsutil/array.h> #include "packet-per.h" #include "packet-ber.h" @@ -26,7 +27,7 @@ void proto_register_novell_pkis (void); void proto_reg_handoff_novell_pkis(void); -static int proto_novell_pkis = -1; +static int proto_novell_pkis; void proto_reg_handoff_novell_pkis(void) { @@ -38,12 +39,12 @@ void proto_register_novell_pkis (void) static hf_register_info hf[] = { #include "packet-novell_pkis-hfarr.c" }; - static gint *ett[] = { + static int *ett[] = { #include "packet-novell_pkis-ettarr.c" }; /* execute protocol initialization only once */ - if (proto_novell_pkis != -1) return; + if (proto_novell_pkis > 0) return; proto_novell_pkis = proto_register_protocol("Novell PKIS ASN.1 type", "novell_pkis", "novell_pkis"); proto_register_field_array (proto_novell_pkis, hf, array_length (hf)); |