summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-dect.c17
-rw-r--r--epan/dissectors/packet-epl.c15
-rw-r--r--epan/dissectors/packet-hclnfsd.c16
-rw-r--r--epan/dissectors/packet-zbee-zdp-management.c7
4 files changed, 29 insertions, 26 deletions
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c
index 2320c4f42d..4ebd89d71f 100644
--- a/epan/dissectors/packet-dect.c
+++ b/epan/dissectors/packet-dect.c
@@ -40,9 +40,12 @@
# include "config.h"
#endif
+#include <string.h>
+
+#include <glib.h>
+
#include <epan/packet.h>
#include <epan/etypes.h>
-#include <string.h>
#define ETHERTYPE_DECT 0x2323
@@ -214,7 +217,7 @@ static int hf_dect_A_Tail_Mt_Encr_Cmd2 = -1;
static int hf_dect_A_Tail_Pt_ExtFlag = -1;
static int hf_dect_A_Tail_Pt_SDU = -1;
static int hf_dect_A_Tail_Pt_RFPI = -1;
-static int hf_dect_A_Tail_Pt_BsData = -1;
+static int hf_dect_A_Tail_Pt_BsData = -1;
static int hf_dect_A_Tail_Pt_InfoType = -1;
static int hf_dect_A_Tail_Pt_SlotPairs = -1;
static int hf_dect_A_Tail_Pt_Fillbits = -1;
@@ -1440,7 +1443,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba,
AField = proto_item_add_subtree(afieldti, ett_afield);
/* Header */
- aheadti = proto_tree_add_item(afieldti, hf_dect_A_Head, tvb, offset, 1, FALSE);
+ aheadti = proto_tree_add_item(AField, hf_dect_A_Head, tvb, offset, 1, FALSE);
AHead = proto_item_add_subtree(aheadti, ett_ahead);
if(dect_packet_type==DECT_PACKET_FP)
@@ -1456,12 +1459,12 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba,
/* Tail */
if(dect_packet_type==DECT_PACKET_FP)
{
- atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5,
+ atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5,
"FP-Tail: %s", val_to_str(ta, TA_vals_FP, "Error, please report: %d"));
}
else
{
- atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5,
+ atailti = proto_tree_add_none_format(afieldti, hf_dect_A_Tail, tvb, offset, 5,
"PP-Tail: %s", val_to_str(ta, TA_vals_PP, "Error, please report: %d"));
}
@@ -1806,7 +1809,7 @@ dissect_afield(gboolean dect_packet_type, guint8 *ba,
if(((tail_0&0x70)>>4)&0xfe)
ep_strbuf_append_printf(afield_str,"%s, ",val_to_str((tail_0&0x70)>>4, PTSDU_vals, "Error, please report: %d"));
-
+
switch((tail_0&0x70)>>4)
{
case 0: /* Zero Length Page */
@@ -2135,7 +2138,7 @@ proto_register_dect(void)
{ &hf_dect_A_Tail_Qt_0_CA,
{"CA", "dect.afield.tail.Qt.CA", FT_NONE, BASE_NONE, NULL,
0x0, NULL, HFILL}},
-
+
/* Byte 3 */
{ &hf_dect_A_Tail_Qt_0_Spr1,
{"Spr1", "dect.afield.tail.Qt.Spr1", FT_UINT8, BASE_DEC, VALS(QTSpr_vals),
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 3b658623e9..9ae791c93d 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -41,7 +41,8 @@
#include "config.h"
#endif
-#include <gmodule.h>
+#include <glib.h>
+
#include <epan/packet.h>
#include <epan/etypes.h>
#include <epan/prefs.h>
@@ -859,8 +860,8 @@ dissect_epl_soc(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, gint of
if (show_soc_flags && check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "MC = %d PS = %d",
- ((EPL_SOC_MC_MASK & flags) >> 7), ((EPL_SOC_PS_MASK & flags) >> 6));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "MC = %d PS = %d",
+ ((EPL_SOC_MC_MASK & flags) >> 7), ((EPL_SOC_PS_MASK & flags) >> 6));
}
if (epl_tree)
@@ -1042,8 +1043,8 @@ dissect_epl_soa(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, guint8
if (svid != EPL_SOA_NOSERVICE && check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "tgt = %3d %s",
- target, val_to_str(svid, soa_svid_vals, "Unknown (%d)"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "tgt = %3d %s",
+ target, val_to_str(svid, soa_svid_vals, "Unknown (%d)"));
}
if (epl_tree)
@@ -1191,7 +1192,7 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g
proto_tree *epl_feat_tree;
device_type = tvb_get_letohl(tvb, offset + 22);
- profile = tvb_get_letohs(tvb, offset + 22);
+ profile = tvb_get_letohs(tvb, offset + 22);
if (epl_tree)
{
@@ -1383,7 +1384,7 @@ dissect_epl_asnd_sres(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g
/*Dissect the whole Error List (display each entry)*/
for (cnt = 0; cnt<number_of_entries; cnt++)
{
- ti_el_entry = proto_tree_add_text(ti_el, tvb, offset, 20, "Entry %d", cnt+1);
+ ti_el_entry = proto_tree_add_text(epl_el_tree, tvb, offset, 20, "Entry %d", cnt+1);
epl_el_entry_tree = proto_item_add_subtree(ti_el_entry, ett_epl_el_entry);
diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c
index b57eb28f3d..7ec1650746 100644
--- a/epan/dissectors/packet-hclnfsd.c
+++ b/epan/dissectors/packet-hclnfsd.c
@@ -614,19 +614,19 @@ dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _
jobtree = proto_item_add_subtree(jobitem, ett_hclnfsd_printjob);
- offset = dissect_rpc_string(tvb, tree,
+ offset = dissect_rpc_string(tvb, jobtree,
hf_hclnfsd_username, offset, NULL);
- offset = dissect_rpc_string(tvb, tree,
+ offset = dissect_rpc_string(tvb, jobtree,
hf_hclnfsd_printparams, offset, NULL);
- offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_queuestatus, offset);
+ offset = dissect_rpc_uint32(tvb, jobtree, hf_hclnfsd_queuestatus, offset);
- offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_jobstatus, offset);
- offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_timesubmitted, offset);
- offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_size, offset);
- offset = dissect_rpc_uint32(tvb, tree, hf_hclnfsd_copies, offset);
- offset = dissect_rpc_string(tvb, tree,
+ offset = dissect_rpc_uint32(tvb, jobtree, hf_hclnfsd_jobstatus, offset);
+ offset = dissect_rpc_uint32(tvb, jobtree, hf_hclnfsd_timesubmitted, offset);
+ offset = dissect_rpc_uint32(tvb, jobtree, hf_hclnfsd_size, offset);
+ offset = dissect_rpc_uint32(tvb, jobtree, hf_hclnfsd_copies, offset);
+ offset = dissect_rpc_string(tvb, jobtree,
hf_hclnfsd_queuecomment, offset, NULL);
datafollows = tvb_get_ntohl(tvb, offset);
diff --git a/epan/dissectors/packet-zbee-zdp-management.c b/epan/dissectors/packet-zbee-zdp-management.c
index 556cb91743..e102520a4b 100644
--- a/epan/dissectors/packet-zbee-zdp-management.c
+++ b/epan/dissectors/packet-zbee-zdp-management.c
@@ -29,9 +29,8 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#include <stdlib.h>
#include <glib.h>
-#include <gmodule.h>
+
#include <epan/packet.h>
#include <epan/addr_resolv.h>
@@ -888,8 +887,8 @@ dissect_zbee_zdp_rsp_mgmt_cache(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
guint64 addr64 = tvb_get_letoh64(tvb, offset);
guint16 addr16 = tvb_get_letohs(tvb, offset+sizeof(guint64));
- if (tree) {
- proto_tree_add_text(tree, tvb, offset, sizeof(guint16)+sizeof(guint64), "{%s = 0x%04x}", get_eui64_name(addr64), addr16);
+ if (field_tree) {
+ proto_tree_add_text(field_tree, tvb, offset, sizeof(guint16)+sizeof(guint64), "{%s = 0x%04x}", get_eui64_name(addr64), addr16);
}
offset += sizeof(guint16)+sizeof(guint64);
} /* for */
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-05 11:07:30 +0000