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/xdlc.c | |
| 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/xdlc.c')
| -rw-r--r-- | epan/xdlc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/xdlc.c b/epan/xdlc.c index df870659..10241753 100644 --- a/epan/xdlc.c +++ b/epan/xdlc.c @@ -120,9 +120,9 @@ const value_string modifier_vals_resp[] = { }; int -get_xdlc_control(const guint8 *pd, int offset, gboolean is_extended) +get_xdlc_control(const uint8_t *pd, int offset, bool is_extended) { - guint16 control; + uint16_t control; switch (pd[offset] & 0x03) { @@ -156,24 +156,24 @@ get_xdlc_control(const guint8 *pd, int offset, gboolean is_extended) int dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *xdlc_tree, int hf_xdlc_control, gint ett_xdlc_control, + proto_tree *xdlc_tree, int hf_xdlc_control, int ett_xdlc_control, const xdlc_cf_items *cf_items_nonext, const xdlc_cf_items *cf_items_ext, const value_string *u_modifier_short_vals_cmd, - const value_string *u_modifier_short_vals_resp, gboolean is_response, - gboolean is_extended, gboolean append_info) + const value_string *u_modifier_short_vals_resp, bool is_response, + bool is_extended, bool append_info) { - guint16 control; + uint16_t control; int control_len; const xdlc_cf_items *cf_items; const char *control_format; - guint16 poll_final; + uint16_t poll_final; char *info; proto_tree *tc, *control_tree; - const gchar *frame_type = NULL; - const gchar *modifier; + const char *frame_type = NULL; + const char *modifier; info=(char *)wmem_alloc(pinfo->pool, 80); - switch (tvb_get_guint8(tvb, offset) & 0x03) { + switch (tvb_get_uint8(tvb, offset) & 0x03) { case XDLC_S: /* @@ -185,7 +185,7 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, cf_items = cf_items_ext; control_format = "Control field: %s (0x%04X)"; } else { - control = tvb_get_guint8(tvb, offset); + control = tvb_get_uint8(tvb, offset); control_len = 1; cf_items = cf_items_nonext; control_format = "Control field: %s (0x%02X)"; @@ -265,7 +265,7 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, u_modifier_short_vals_cmd = modifier_short_vals_cmd; if (u_modifier_short_vals_resp == NULL) u_modifier_short_vals_resp = modifier_short_vals_resp; - control = tvb_get_guint8(tvb, offset); + control = tvb_get_uint8(tvb, offset); control_len = 1; cf_items = cf_items_nonext; control_format = "Control field: %s (0x%02X)"; @@ -323,7 +323,7 @@ dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo, (control & XDLC_N_R_EXT_MASK) >> XDLC_N_R_EXT_SHIFT, (control & XDLC_N_S_EXT_MASK) >> XDLC_N_S_EXT_SHIFT); } else { - control = tvb_get_guint8(tvb, offset); + control = tvb_get_uint8(tvb, offset); control_len = 1; cf_items = cf_items_nonext; control_format = "Control field: %s (0x%02X)"; |