summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-adb_service.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
commita86c5f7cae7ec9a3398300555a0b644689d946a1 (patch)
tree39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-adb_service.h
parentReleasing progress-linux version 4.2.6-1~progress7.99u1. (diff)
downloadwireshark-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/packet-adb_service.h')
-rw-r--r--epan/dissectors/packet-adb_service.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-adb_service.h b/epan/dissectors/packet-adb_service.h
index ca7ee103..a3317a32 100644
--- a/epan/dissectors/packet-adb_service.h
+++ b/epan/dissectors/packet-adb_service.h
@@ -10,15 +10,15 @@
#ifndef __PACKET_ADB_SERVICE_H__
#define __PACKET_ADB_SERVICE_H__
-gint dissect_ascii_uint32(proto_tree *tree, gint hf_hex_ascii, gint ett_hex_ascii,
- gint hf_value, tvbuff_t *tvb, gint offset, guint32 *value);
+int dissect_ascii_uint32(proto_tree *tree, int hf_hex_ascii, int ett_hex_ascii,
+ int hf_value, tvbuff_t *tvb, int offset, uint32_t *value);
typedef struct {
- guint32 session_key_length;
- guint32 *session_key;
+ uint32_t session_key_length;
+ uint32_t *session_key;
- const gchar *service;
- gint direction;
+ const char *service;
+ int direction;
} adb_service_data_t;
#endif /* __PACKET_ADB_SERVICE_H__ */