diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2024-07-04 11:30:14 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2024-07-05 10:21:57 +0000 |
| commit | 93c092f93dbbf24944a457a6f024df6e13721ddf (patch) | |
| tree | 914d28a14648a43956eadbbc180e332485e8efe4 /epan/dissectors/asn1/t125 | |
| parent | acd8dca562a07a6811788617bdca03f4f3a27753 (diff) | |
epan: Convert ASN.1 dissectors to C99
Ping #19116
Diffstat (limited to 'epan/dissectors/asn1/t125')
| -rw-r--r-- | epan/dissectors/asn1/t125/packet-t125-template.c | 18 | ||||
| -rw-r--r-- | epan/dissectors/asn1/t125/t125.cnf | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/asn1/t125/packet-t125-template.c b/epan/dissectors/asn1/t125/packet-t125-template.c index 57d4ef0ad4..99252cd0e7 100644 --- a/epan/dissectors/asn1/t125/packet-t125-template.c +++ b/epan/dissectors/asn1/t125/packet-t125-template.c @@ -57,9 +57,9 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *d { proto_item *item = NULL; proto_tree *tree = NULL; - gint8 ber_class; + int8_t ber_class; bool pc; - gint32 tag; + int32_t tag; top_tree = parent_tree; @@ -84,24 +84,24 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *d static bool dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_) { - gint8 ber_class; + int8_t ber_class; bool pc; - gint32 tag; + int32_t tag; volatile bool failed; /* * We must catch all the "ran past the end of the packet" exceptions - * here and, if we catch one, just return FALSE. It's too painful + * here and, if we catch one, just return false. It's too painful * to have a version of dissect_per_sequence() that checks all * references to the tvbuff before making them and returning "no" * if they would fail. */ - failed = FALSE; + failed = false; TRY { /* could be BER */ get_ber_identifier(tvb, 0, &ber_class, &pc, &tag); } CATCH_BOUNDS_ERRORS { - failed = TRUE; + failed = true; } ENDTRY; if (failed) { @@ -119,7 +119,7 @@ dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo * This might not be enough, but since t125 only catch COTP packets, * it should not be a problem. */ - guint8 first_byte = tvb_get_guint8(tvb, 0) >> 2; + uint8_t first_byte = tvb_get_guint8(tvb, 0) >> 2; switch (first_byte) { case HF_T125_ERECT_DOMAIN_REQUEST: case HF_T125_ATTACH_USER_REQUEST: @@ -146,7 +146,7 @@ void proto_register_t125(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_t125, #include "packet-t125-ettarr.c" }; diff --git a/epan/dissectors/asn1/t125/t125.cnf b/epan/dissectors/asn1/t125/t125.cnf index 012896f640..d7d2b9167c 100644 --- a/epan/dissectors/asn1/t125/t125.cnf +++ b/epan/dissectors/asn1/t125/t125.cnf @@ -77,7 +77,7 @@ ConnectMCSPDU # dissected in t124 # FN_BODY DomainMCSPDU VAL_PTR = &domainmcs_value -# gint domainmcs_value; +# int domainmcs_value; # #%(DEFAULT_BODY)s # switch(domainmcs_value) { |