summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pcli.c
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-pcli.c
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-pcli.c')
-rw-r--r--epan/dissectors/packet-pcli.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c
index 78da68a5..576ae2e7 100644
--- a/epan/dissectors/packet-pcli.c
+++ b/epan/dissectors/packet-pcli.c
@@ -64,35 +64,35 @@ static dissector_handle_t pcli_handle, pcli_handle8, pcli_handle12, pcli_handle2
/* Define the pcli proto */
-static int proto_pcli = -1;
-static int proto_pcli8 = -1;
-static int proto_pcli12 = -1;
-static int proto_pcli20 = -1;
+static int proto_pcli;
+static int proto_pcli8;
+static int proto_pcli12;
+static int proto_pcli20;
/* Define headers for pcli */
-static int hf_pcli_cccid = -1;
-static int hf_pcli_header = -1;
-static int hf_pcli_timestamp = -1;
-static int hf_pcli_case_id = -1;
+static int hf_pcli_cccid;
+static int hf_pcli_header;
+static int hf_pcli_timestamp;
+static int hf_pcli_case_id;
/* Define the tree for pcli */
-static int ett_pcli = -1;
+static int ett_pcli;
/*
* Here are the global variables associated with the preferences
* for pcli
*/
-static gboolean pcli_summary_in_tree = TRUE;
+static bool pcli_summary_in_tree = true;
static dissector_table_t pcli_subdissector_table;
static proto_tree *
dissect_pcli_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int* offset)
{
- guint32 cccid;
+ uint32_t cccid;
proto_tree *pcli_tree;
proto_item *pcli_item;
@@ -189,7 +189,7 @@ dissect_pcli20(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
}
static void
-pcli_prompt(packet_info *pinfo _U_, gchar* result)
+pcli_prompt(packet_info *pinfo _U_, char* result)
{
snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "PCLI payload as");
}
@@ -212,7 +212,7 @@ proto_register_pcli(void)
NULL, HFILL }},
};
- static gint *ett[] = {
+ static int *ett[] = {
&ett_pcli,
};