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/file-pcapng-darwin.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/dissectors/file-pcapng-darwin.c')
| -rw-r--r-- | epan/dissectors/file-pcapng-darwin.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/file-pcapng-darwin.c b/epan/dissectors/file-pcapng-darwin.c index 055389a4..c3cb827a 100644 --- a/epan/dissectors/file-pcapng-darwin.c +++ b/epan/dissectors/file-pcapng-darwin.c @@ -53,7 +53,7 @@ * o Block Type: The block type of a Darwin Process Event Block is 2147483649. * * Note: This specific block type number falls into the range defined - * for "local use" but has in fact been available publically since Darwin + * for "local use" but has in fact been available publicly since Darwin * 13.0 for pcapng files generated by Apple's tcpdump when using the PKTAP * enhanced interface. * @@ -113,16 +113,16 @@ * */ -static int proto_pcapng_darwin_process_info = -1; +static int proto_pcapng_darwin_process_info; void proto_register_pcapng_darwin_process_info(void); void proto_reg_handoff_pcapng_darwin_process_info(void); -static int hf_pcapng_option_code_darwin_process_info = -1; -static int hf_pcapng_darwin_process_id = -1; -static int hf_pcapng_option_darwin_process_name = -1; -static int hf_pcapng_option_darwin_process_uuid = -1; +static int hf_pcapng_option_code_darwin_process_info; +static int hf_pcapng_darwin_process_id; +static int hf_pcapng_option_darwin_process_name; +static int hf_pcapng_option_darwin_process_uuid; #define BLOCK_DARWIN_PROCESS 0x80000001 #define BLOCK_DARWIN_PROCESS_NAME "Darwin Process Event Block" @@ -141,8 +141,8 @@ static void dissect_darwin_process_info_option(proto_tree *option_tree, proto_item *option_item, packet_info *pinfo, tvbuff_t *tvb, int offset, int unknown_option_hf, - guint32 option_code, guint32 option_length, - guint encoding _U_) + uint32_t option_code, uint32_t option_length, + unsigned encoding _U_) { char *str; e_guid_t uuid; |