summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-glusterd.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-glusterd.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-glusterd.c')
-rw-r--r--epan/dissectors/packet-glusterd.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c
index a4778af5..05636504 100644
--- a/epan/dissectors/packet-glusterd.c
+++ b/epan/dissectors/packet-glusterd.c
@@ -31,35 +31,35 @@ void proto_register_gluster_gd_mgmt(void);
void proto_reg_handoff_gluster_gd_mgmt(void);
/* Initialize the protocol and registered fields */
-static gint proto_glusterd = -1;
-static gint proto_gd_mgmt = -1;
-static gint proto_gd_brick = -1;
-static gint proto_gd_friend = -1;
+static int proto_glusterd;
+static int proto_gd_mgmt;
+static int proto_gd_brick;
+static int proto_gd_friend;
/* programs and procedures */
-static gint hf_gd_mgmt_proc = -1;
-static gint hf_gd_mgmt_2_proc = -1;
-static gint hf_gd_mgmt_3_proc = -1;
-static gint hf_gd_mgmt_brick_2_proc = -1;
-static gint hf_glusterd_friend_proc = -1;
+static int hf_gd_mgmt_proc;
+static int hf_gd_mgmt_2_proc;
+static int hf_gd_mgmt_3_proc;
+static int hf_gd_mgmt_brick_2_proc;
+static int hf_glusterd_friend_proc;
/* fields used by multiple programs/procedures */
-static gint hf_glusterd_dict = -1;
-static gint hf_glusterd_op = -1;
-static gint hf_glusterd_op_ret = -1;
-static gint hf_glusterd_op_errstr = -1;
-static gint hf_glusterd_uuid = -1;
-static gint hf_glusterd_tnx_id = -1;
-static gint hf_glusterd_hostname = -1;
-static gint hf_glusterd_port = -1;
-static gint hf_glusterd_vols = -1;
-static gint hf_glusterd_buf = -1;
-static gint hf_glusterd_name = -1;
+static int hf_glusterd_dict;
+static int hf_glusterd_op;
+static int hf_glusterd_op_ret;
+static int hf_glusterd_op_errstr;
+static int hf_glusterd_uuid;
+static int hf_glusterd_tnx_id;
+static int hf_glusterd_hostname;
+static int hf_glusterd_port;
+static int hf_glusterd_vols;
+static int hf_glusterd_buf;
+static int hf_glusterd_name;
/* Initialize the subtree pointers */
-static gint ett_gd_mgmt = -1;
-static gint ett_gd_brick = -1;
-static gint ett_gd_friend = -1;
+static int ett_gd_mgmt;
+static int ett_gd_brick;
+static int ett_gd_friend;
/* the UUID is the same as a GlusterFS GFID, except it's encoded per byte */
static int
@@ -861,7 +861,7 @@ proto_register_gluster_gd_mgmt(void)
};
/* Setup protocol subtree array */
- static gint *ett[] = {
+ static int *ett[] = {
&ett_gd_mgmt,
&ett_gd_brick,
&ett_gd_friend