From 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:33 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/crc10-tvb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/crc10-tvb.c') diff --git a/epan/crc10-tvb.c b/epan/crc10-tvb.c index 406cf89e..ffae9795 100644 --- a/epan/crc10-tvb.c +++ b/epan/crc10-tvb.c @@ -16,10 +16,10 @@ #include /* update the data block's CRC-10 remainder one byte at a time */ -guint16 -update_crc10_by_bytes_tvb(guint16 crc10, tvbuff_t *tvb, int offset, int len) +uint16_t +update_crc10_by_bytes_tvb(uint16_t crc10, tvbuff_t *tvb, int offset, int len) { - const guint8 *buf; + const uint8_t *buf; tvb_ensure_bytes_exist(tvb, offset, len); /* len == -1 not allowed */ buf = tvb_get_ptr(tvb, offset, len); -- cgit v1.2.3