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/packet-fmp_notify.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/packet-fmp_notify.c')
| -rw-r--r-- | epan/dissectors/packet-fmp_notify.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c index 87b34069..973718bb 100644 --- a/epan/dissectors/packet-fmp_notify.c +++ b/epan/dissectors/packet-fmp_notify.c @@ -38,30 +38,30 @@ typedef enum { FMP_LIST_SERVER_RESOURCE_LOW = 2 } revokeHandleListReason; -static int proto_fmp_notify = -1; -static int hf_fmp_handleListLen = -1; -static int hf_fmp_notify_procedure = -1; -static int hf_fmp_fsID = -1; -/* static int hf_fmp_fsBlkSz = -1; */ -static int hf_fmp_sessionHandle = -1; -static int hf_fmp_fmpFHandle = -1; -static int hf_fmp_msgNum = -1; -static int hf_fmp_fileSize = -1; -static int hf_fmp_cookie = -1; -static int hf_fmp_firstLogBlk = -1; -static int hf_fmp_numBlksReq = -1; -static int hf_fmp_status = -1; -static int hf_fmp_extentList_len = -1; -static int hf_fmp_numBlks = -1; -static int hf_fmp_volID = -1; -static int hf_fmp_startOffset = -1; -static int hf_fmp_extent_state = -1; -static int hf_fmp_revokeHandleListReason = -1; - -static gint ett_fmp_notify = -1; -static gint ett_fmp_notify_hlist = -1; -static gint ett_fmp_extList = -1; -static gint ett_fmp_ext = -1; +static int proto_fmp_notify; +static int hf_fmp_handleListLen; +static int hf_fmp_notify_procedure; +static int hf_fmp_fsID; +/* static int hf_fmp_fsBlkSz; */ +static int hf_fmp_sessionHandle; +static int hf_fmp_fmpFHandle; +static int hf_fmp_msgNum; +static int hf_fmp_fileSize; +static int hf_fmp_cookie; +static int hf_fmp_firstLogBlk; +static int hf_fmp_numBlksReq; +static int hf_fmp_status; +static int hf_fmp_extentList_len; +static int hf_fmp_numBlks; +static int hf_fmp_volID; +static int hf_fmp_startOffset; +static int hf_fmp_extent_state; +static int hf_fmp_revokeHandleListReason; + +static int ett_fmp_notify; +static int ett_fmp_notify_hlist; +static int ett_fmp_extList; +static int ett_fmp_ext; static int dissect_fmp_notify_extentList(tvbuff_t *, int, packet_info *, proto_tree *); @@ -450,12 +450,12 @@ dissect_fmp_notify_extentState(tvbuff_t *tvb, int offset, proto_tree *tree) static int dissect_fmp_notify_extent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree, guint32 ext_num) + proto_tree *tree, uint32_t ext_num) { proto_tree *extTree; extTree = proto_tree_add_subtree_format(tree, tvb, offset, 20 , - ett_fmp_ext, NULL, "Extent (%u)", (guint32) ext_num); + ett_fmp_ext, NULL, "Extent (%u)", (uint32_t) ext_num); offset = dissect_rpc_uint32(tvb, extTree, hf_fmp_firstLogBlk, offset); @@ -474,10 +474,10 @@ static int dissect_fmp_notify_extentList(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - guint32 numExtents; - guint32 totalLength; + uint32_t numExtents; + uint32_t totalLength; proto_tree *extListTree; - guint32 i; + uint32_t i; numExtents = tvb_get_ntohl(tvb, offset); totalLength = 4 + (20 * numExtents); @@ -583,7 +583,7 @@ proto_register_fmp_notify(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_fmp_notify, &ett_fmp_notify_hlist, &ett_fmp_extList, |