aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-dmp.c2
-rw-r--r--epan/dissectors/packet-dua.c2
-rw-r--r--epan/dissectors/packet-fmp.c6
-rw-r--r--epan/dissectors/packet-fmp_notify.c4
-rw-r--r--epan/dissectors/packet-icmpv6.c2
-rw-r--r--epan/dissectors/packet-ieee80211.c26
-rw-r--r--epan/dissectors/packet-m3ua.c12
-rw-r--r--epan/dissectors/packet-mojito.c26
-rw-r--r--epan/dissectors/packet-mongo.c2
-rw-r--r--epan/dissectors/packet-ptp.c6
-rw-r--r--epan/dissectors/packet-spice.c2
-rw-r--r--epan/dissectors/packet-ua3g.c15
-rw-r--r--epan/dissectors/packet-vnc.c24
13 files changed, 66 insertions, 63 deletions
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index f84065da7f..668134ed10 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -3047,7 +3047,7 @@ static gint dissect_dmp_envelope (tvbuff_t *tvb, packet_info *pinfo,
offset = dissect_dmp_originator (tvb, pinfo, envelope_tree, offset);
}
- for (i = 1; i <= no_rec; i++) {
+ for (i = 0; i < no_rec; i++) {
/* Recipient(s) */
offset = dissect_dmp_address (tvb, pinfo, envelope_tree, offset,
&prev_rec_no, FALSE);
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index a187cd0fb6..51d19d9714 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -176,7 +176,7 @@ dissect_integer_range_interface_identifier_parameter(tvbuff_t *parameter_tvb, pr
number_of_ranges = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) / INTERVAL_LENGTH;
offset = PARAMETER_VALUE_OFFSET;
- for(range_number = 1; range_number <= number_of_ranges; range_number++) {
+ for(range_number = 0; range_number < number_of_ranges; range_number++) {
proto_tree_add_item(parameter_tree, hf_interface_range_start,
parameter_tvb, offset + START_OFFSET, START_LENGTH, ENC_BIG_ENDIAN);
proto_tree_add_item(parameter_tree, hf_interface_range_end,
diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c
index df73f1a243..e45c804f23 100644
--- a/epan/dissectors/packet-fmp.c
+++ b/epan/dissectors/packet-fmp.c
@@ -357,8 +357,8 @@ dissect_fmp_extentList(tvbuff_t *tvb, int offset, packet_info *pinfo,
offset = dissect_rpc_uint32(tvb, extListTree,
hf_fmp_extentList_len, offset);
- for (i = 1; i <= numExtents; i++) {
- offset = dissect_fmp_extent(tvb, offset, pinfo, extListTree, i);
+ for (i = 0; i < numExtents; i++) {
+ offset = dissect_fmp_extent(tvb, offset, pinfo, extListTree, i+1);
}
return offset;
@@ -378,7 +378,7 @@ dissect_fmp_extentListEx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
offset += 4;
- for (i = 1; i <= numExtents; i++) {
+ for (i = 0; i < numExtents; i++) {
extListItem = proto_tree_add_text(tree, tvb, offset, 28,
"Extent List");
extListTree = proto_item_add_subtree(extListItem, ett_fmp_extList);
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index d3fad2d10e..65d0da5e34 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -620,8 +620,8 @@ dissect_fmp_notify_extentList(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
offset = dissect_rpc_uint32(tvb, extListTree,
hf_fmp_extentList_len, offset);
- for (i = 1; i <= numExtents; i++) {
- offset = dissect_fmp_notify_extent(tvb, offset, pinfo, extListTree, i);
+ for (i = 0; i < numExtents; i++) {
+ offset = dissect_fmp_notify_extent(tvb, offset, pinfo, extListTree, i+1);
}
return offset;
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index a1f4ebac73..26059a57dd 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -3149,7 +3149,7 @@ dissect_mldrv2( tvbuff_t *tvb, guint32 offset, packet_info *pinfo _U_, proto_tre
mldr_offset += 16;
/* Source Address */
- for (i=1; i <= nb_sources; i++){
+ for (i=0; i < nb_sources; i++){
proto_tree_add_item(mar_tree, hf_icmpv6_mldr_mar_source_address, tvb, mldr_offset, 16, ENC_NA);
mldr_offset += 16;
}
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index e6772a2a21..3811de9d08 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -5945,7 +5945,7 @@ dissect_vendor_ie_wpawme(proto_tree * tree, tvbuff_t * tvb, int offset, guint32
proto_tree *wpa_mcs_tree, *wpa_ucs_tree, *wpa_akms_tree;
proto_tree *wpa_sub_ucs_tree, *wpa_sub_akms_tree;
guint16 ucs_count, akms_count;
- guint i;
+ guint ii;
proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_version, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
@@ -5971,7 +5971,7 @@ dissect_vendor_ie_wpawme(proto_tree * tree, tvbuff_t * tvb, int offset, guint32
wpa_ucs_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_ucs_list, tvb, offset, ucs_count * 4, ENC_NA);
wpa_ucs_tree = proto_item_add_subtree(wpa_ucs_item, ett_wpa_ucs_tree);
- for(i = 1; i <= ucs_count; i++)
+ for(ii = 0; ii < ucs_count; ii++)
{
wpa_sub_ucs_item = proto_tree_add_item(wpa_ucs_tree, hf_ieee80211_wfa_ie_wpa_ucs, tvb, offset, 4, ENC_BIG_ENDIAN);
wpa_sub_ucs_tree = proto_item_add_subtree(wpa_sub_ucs_item, ett_wpa_sub_ucs_tree);
@@ -5995,7 +5995,7 @@ dissect_vendor_ie_wpawme(proto_tree * tree, tvbuff_t * tvb, int offset, guint32
wpa_akms_item = proto_tree_add_item(tree, hf_ieee80211_wfa_ie_wpa_akms_list, tvb, offset, akms_count * 4, ENC_NA);
wpa_akms_tree = proto_item_add_subtree(wpa_akms_item, ett_wpa_akms_tree);
- for(i = 1; i <= akms_count; i++)
+ for(ii = 0; ii < akms_count; ii++)
{
wpa_sub_akms_item = proto_tree_add_item(wpa_akms_tree, hf_ieee80211_wfa_ie_wpa_akms, tvb, offset, 4, ENC_BIG_ENDIAN);
wpa_sub_akms_tree = proto_item_add_subtree(wpa_sub_akms_item, ett_wpa_sub_akms_tree);
@@ -6516,7 +6516,7 @@ dissect_rsn_ie(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb,
proto_tree *rsn_gcs_tree, *rsn_pcs_tree, *rsn_akms_tree, *rsn_cap_tree, *rsn_pmkid_tree, *rsn_gmcs_tree;
proto_tree *rsn_sub_pcs_tree, *rsn_sub_akms_tree;
guint16 pcs_count, akms_count, pmkid_count;
- guint i;
+ guint ii;
int tag_end = offset + tag_len;
proto_tree_add_item(tree, hf_ieee80211_rsn_version, tvb, offset, 2, ENC_LITTLE_ENDIAN);
@@ -6550,7 +6550,7 @@ dissect_rsn_ie(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb,
rsn_pcs_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pcs_list, tvb, offset, pcs_count * 4, ENC_NA);
rsn_pcs_tree = proto_item_add_subtree(rsn_pcs_item, ett_rsn_pcs_tree);
- for(i = 1; i <= pcs_count; i++)
+ for(ii = 0; ii < pcs_count; ii++)
{
rsn_sub_pcs_item = proto_tree_add_item(rsn_pcs_tree, hf_ieee80211_rsn_pcs, tvb, offset, 4, ENC_BIG_ENDIAN);
rsn_sub_pcs_tree = proto_item_add_subtree(rsn_sub_pcs_item, ett_rsn_sub_pcs_tree);
@@ -6586,7 +6586,7 @@ dissect_rsn_ie(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb,
rsn_akms_item = proto_tree_add_item(tree, hf_ieee80211_rsn_akms_list, tvb, offset, akms_count * 4, ENC_NA);
rsn_akms_tree = proto_item_add_subtree(rsn_akms_item, ett_rsn_akms_tree);
- for(i = 1; i <= akms_count; i++)
+ for(ii = 0; ii < akms_count; ii++)
{
rsn_sub_akms_item = proto_tree_add_item(rsn_akms_tree, hf_ieee80211_rsn_akms, tvb, offset, 4, ENC_BIG_ENDIAN);
rsn_sub_akms_tree = proto_item_add_subtree(rsn_sub_akms_item, ett_rsn_sub_akms_tree);
@@ -6633,7 +6633,7 @@ dissect_rsn_ie(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb,
rsn_pmkid_item = proto_tree_add_item(tree, hf_ieee80211_rsn_pmkid_list, tvb, offset, pmkid_count * 16, ENC_NA);
rsn_pmkid_tree = proto_item_add_subtree(rsn_pmkid_item, ett_rsn_pmkid_tree);
- for(i = 1; i <= pmkid_count; i++)
+ for(ii = 0; ii < pmkid_count; ii++)
{
proto_tree_add_item(rsn_pmkid_tree, hf_ieee80211_rsn_pmkid, tvb, offset, 16, ENC_NA);
offset +=16;
@@ -10524,7 +10524,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
case 3: /* Multi-TID BlockAckReq */
{
guint8 tid_count;
- guint i;
+ guint iii;
proto_tree *bar_mtid_tree, *bar_mtid_sub_tree;
tid_count = ((bar_control & 0xF000) >> 12) + 1;
@@ -10534,8 +10534,8 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
bar_parent_item = proto_tree_add_text (hdr_tree, tvb, offset, tid_count*4, "Per TID Info");
bar_mtid_tree = proto_item_add_subtree(bar_parent_item, ett_block_ack);
- for (i = 1; i <= tid_count; i++) {
- bar_parent_item = proto_tree_add_uint(bar_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, i);
+ for (iii = 0; iii < tid_count; iii++) {
+ bar_parent_item = proto_tree_add_uint(bar_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, iii);
bar_mtid_sub_tree = proto_item_add_subtree(bar_parent_item, ett_block_ack);
bar_control = tvb_get_letohs(tvb, offset);
@@ -10629,7 +10629,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
case 3: /* Multi-TID BlockAck */
{
guint8 tid_count;
- guint i;
+ guint iii;
proto_tree *ba_mtid_tree, *ba_mtid_sub_tree;
tid_count = ((ba_control & 0xF000) >> 12) + 1;
@@ -10641,8 +10641,8 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
ba_parent_item = proto_tree_add_text (hdr_tree, tvb, offset, tid_count*4, "Per TID Info");
ba_mtid_tree = proto_item_add_subtree(ba_parent_item, ett_block_ack);
- for (i = 1; i <= tid_count; i++) {
- ba_parent_item = proto_tree_add_uint(ba_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, i);
+ for (iii = 0; iii < tid_count; iii++) {
+ ba_parent_item = proto_tree_add_uint(ba_mtid_tree, hf_ieee80211_block_ack_multi_tid_info, tvb, offset, 4, iii);
ba_mtid_sub_tree = proto_item_add_subtree(ba_parent_item, ett_block_ack);
ba_control = tvb_get_letohs(tvb, offset);
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 851e47cb64..7cbb3a157d 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -426,7 +426,7 @@ dissect_affected_destinations_parameter(tvbuff_t *parameter_tvb, proto_tree *par
number_of_destinations = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) >> 2;
destination_offset = PARAMETER_VALUE_OFFSET;
- for(destination_number=1; destination_number <= number_of_destinations; destination_number++) {
+ for(destination_number=0; destination_number < number_of_destinations; destination_number++) {
proto_tree_add_item(parameter_tree, hf_affected_point_code_mask, parameter_tvb, destination_offset + AFFECTED_MASK_OFFSET, AFFECTED_MASK_LENGTH, ENC_BIG_ENDIAN);
item = proto_tree_add_item(parameter_tree, hf_affected_point_code_pc, parameter_tvb, destination_offset + AFFECTED_DPC_OFFSET, AFFECTED_DPC_LENGTH, ENC_BIG_ENDIAN);
if (mtp3_pc_structured())
@@ -446,7 +446,7 @@ dissect_routing_context_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter
number_of_contexts = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) >> 2;
context_offset = PARAMETER_VALUE_OFFSET;
- for(context_number=1; context_number <= number_of_contexts; context_number++) {
+ for(context_number=0; context_number < number_of_contexts; context_number++) {
proto_tree_add_item(parameter_tree, hf_routing_context, parameter_tvb, context_offset, ROUTING_CONTEXT_LENGTH, ENC_BIG_ENDIAN);
context_offset += ROUTING_CONTEXT_LENGTH;
};
@@ -992,7 +992,7 @@ dissect_service_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
number_of_sis = length - PARAMETER_HEADER_LENGTH;
si_offset = PARAMETER_VALUE_OFFSET;
- for(si_number=1; si_number <= number_of_sis; si_number++) {
+ for(si_number=0; si_number < number_of_sis; si_number++) {
proto_tree_add_item(parameter_tree, hf_si, parameter_tvb, si_offset, SI_LENGTH, ENC_BIG_ENDIAN);
si_offset += SI_LENGTH;
};
@@ -1011,7 +1011,7 @@ dissect_subsystem_numbers_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet
number_of_ssns = length - PARAMETER_HEADER_LENGTH;
ssn_offset = PARAMETER_VALUE_OFFSET;
- for(ssn_number=1; ssn_number <= number_of_ssns; ssn_number++) {
+ for(ssn_number=0; ssn_number < number_of_ssns; ssn_number++) {
proto_tree_add_item(parameter_tree, hf_ssn, parameter_tvb, ssn_offset, SSN_LENGTH, ENC_BIG_ENDIAN);
ssn_offset += SSN_LENGTH;
};
@@ -1036,7 +1036,7 @@ dissect_originating_point_code_list_parameter(tvbuff_t *parameter_tvb, proto_tre
number_of_point_codes = (length - PARAMETER_HEADER_LENGTH) / 4;
point_code_offset = PARAMETER_VALUE_OFFSET;
- for(point_code_number=1; point_code_number <= number_of_point_codes; point_code_number++) {
+ for(point_code_number=0; point_code_number < number_of_point_codes; point_code_number++) {
proto_tree_add_item(parameter_tree, hf_opc_list_mask, parameter_tvb, point_code_offset + OPC_MASK_OFFSET, OPC_MASK_LENGTH, ENC_BIG_ENDIAN);
item = proto_tree_add_item(parameter_tree, hf_opc_list_pc, parameter_tvb, point_code_offset + OPC_PC_OFFSET, OPC_PC_LENGTH, ENC_BIG_ENDIAN);
if (mtp3_pc_structured())
@@ -1070,7 +1070,7 @@ dissect_circuit_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_t
number_of_point_codes = (length - PARAMETER_HEADER_LENGTH) / CIC_RANGE_LENGTH;
point_code_offset = PARAMETER_VALUE_OFFSET;
- for(point_code_number = 1; point_code_number <= number_of_point_codes; point_code_number++) {
+ for(point_code_number = 0; point_code_number < number_of_point_codes; point_code_number++) {
cic_range_item = proto_tree_add_text(parameter_tree, parameter_tvb, point_code_offset + CIC_RANGE_MASK_OFFSET, CIC_RANGE_LENGTH, "CIC range");
cic_range_tree = proto_item_add_subtree(cic_range_item, ett_parameter);
diff --git a/epan/dissectors/packet-mojito.c b/epan/dissectors/packet-mojito.c
index e4034e431c..847cd09e4b 100644
--- a/epan/dissectors/packet-mojito.c
+++ b/epan/dissectors/packet-mojito.c
@@ -404,7 +404,7 @@ dissect_mojito_store_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
{
proto_tree *dht_tree, *version_tree;
proto_item *dht_item, *version_item;
- guint8 i, contactcount;
+ guint8 ii, contactcount;
guint8 sectokenlen = tvb_get_guint8(tvb, offset);
guint16 dhtvaluelength;
int contact_offset, start_offset;
@@ -421,9 +421,9 @@ dissect_mojito_store_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
offset += 1;
/* For each Contact, display the info */
- for (i = 1; i <= contactcount; i++)
+ for (ii = 0; ii < contactcount; ii++)
{
- dht_item = proto_tree_add_text(tree, tvb, offset, 1, "DHTValue #%d", i);
+ dht_item = proto_tree_add_text(tree, tvb, offset, 1, "DHTValue #%d", ii+1);
dht_tree = proto_item_add_subtree(dht_item, ett_mojito_dht);
start_offset = offset;
contact_offset = dissect_mojito_contact(tvb, pinfo, dht_tree, offset, -1);
@@ -462,7 +462,7 @@ dissect_mojito_store_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
{
proto_tree *sc_tree;
proto_item *sc_item;
- guint8 i, contactcount = tvb_get_guint8(tvb, offset);
+ guint8 ii, contactcount = tvb_get_guint8(tvb, offset);
guint16 dhtvaluelength;
int start_offset;
@@ -470,9 +470,9 @@ dissect_mojito_store_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
offset += 1;
/* For each Contact, display the info */
- for (i = 1; i <= contactcount; i++)
+ for (ii = 0; ii < contactcount; ii++)
{
- sc_item = proto_tree_add_text(tree, tvb, offset, 23, "Status Code %d", i);
+ sc_item = proto_tree_add_text(tree, tvb, offset, 23, "Status Code %d", ii+1);
sc_tree = proto_item_add_subtree(sc_item, ett_mojito_status_code);
start_offset = offset;
@@ -505,7 +505,7 @@ dissect_mojito_store_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
static void
dissect_mojito_find_node_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
{
- guint8 i, contactcount;
+ guint8 ii, contactcount;
guint8 sectokenlen = tvb_get_guint8(tvb, offset);
int contact_offset;
@@ -520,9 +520,9 @@ dissect_mojito_find_node_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree
offset += 1;
/* For each Contact, display the info */
- for (i = 1; i <= contactcount; i++)
+ for (ii = 0; ii < contactcount; ii++)
{
- contact_offset = dissect_mojito_contact(tvb, pinfo, tree, offset, i);
+ contact_offset = dissect_mojito_contact(tvb, pinfo, tree, offset, ii+1);
if (contact_offset == 0)
return;
offset += contact_offset;
@@ -568,7 +568,7 @@ dissect_mojito_find_value_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree
proto_item *dht_item, *version_item, *kuid_item;
guint16 dhtvaluelength;
int contact_offset, start_offset;
- guint8 i, dhtvaluescount, kuidcount;
+ guint8 ii, dhtvaluescount, kuidcount;
proto_tree_add_item(tree, hf_mojito_requestload, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
@@ -578,9 +578,9 @@ dissect_mojito_find_value_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree
offset += 1;
/* For each Contact, display the info */
- for (i = 1; i <= dhtvaluescount; i++)
+ for (ii = 0; ii < dhtvaluescount; ii++)
{
- dht_item = proto_tree_add_text(tree, tvb, offset, 1, "DHTValue #%d", i);
+ dht_item = proto_tree_add_text(tree, tvb, offset, 1, "DHTValue #%d", ii+1);
dht_tree = proto_item_add_subtree(dht_item, ett_mojito_dht);
start_offset = offset;
contact_offset = dissect_mojito_contact(tvb, pinfo, dht_tree, offset, -1);
@@ -624,7 +624,7 @@ dissect_mojito_find_value_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree
offset += 1;
/* All the Secondary KUID's */
- for (i = 0; i < kuidcount; i++)
+ for (ii = 0; ii < kuidcount; ii++)
{
proto_tree_add_item(kuid_tree, hf_mojito_kuid, tvb, offset, 20, ENC_NA);
offset += 20;
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index b5cd1106b3..9a0e88239f 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -422,7 +422,7 @@ dissect_mongo_reply(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree
number_returned = tvb_get_letohl(tvb, offset);
offset += 4;
- for (i=1; i <= number_returned; i++)
+ for (i=0; i < number_returned; i++)
{
offset += dissect_bson_document(tvb, pinfo, offset, tree, hf_mongo_document, 1);
}
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index 94392ed787..237da1582a 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -3156,7 +3156,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
case PTP_V2_MM_ID_FAULT_LOG:
{
- guint16 i, num = 0;
+ guint16 ii, num = 0;
proto_item *ptpError_ti;
proto_tree *ptpError_subtree;
@@ -3166,7 +3166,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
Offset, 2, ENC_BIG_ENDIAN);
Offset +=2;
- for (i = 1; i <= num; i++)
+ for (ii = 0; ii < num; ii++)
{
ptpError_ti = proto_tree_add_text(ptp_managementData_tree, tvb, Offset, tvb_get_ntohs (tvb, Offset), "Fault record");
@@ -3535,7 +3535,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
guint16 i = 0;
/* one or more ClockIdentity */
- for (i = 1; i <= (tlv_length / 8); i++)
+ for (i = 0; i < (tlv_length / 8); i++)
{
proto_tree_add_item(ptp_managementData_tree, hf_ptp_v2_mm_clockidentity, tvb,
Offset, 8, ENC_BIG_ENDIAN);
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c
index df67ba7856..a1becd46c5 100644
--- a/epan/dissectors/packet-spice.c
+++ b/epan/dissectors/packet-spice.c
@@ -2501,7 +2501,7 @@ dissect_spice_main_server(tvbuff_t *tvb, proto_tree *tree, const guint16 message
num_channels = tvb_get_letohl(tvb, offset);
proto_tree_add_text(tree, tvb, offset, 4, "Number of channels: %u", num_channels);
offset += 4;
- for (i = 1; i <= num_channels; i++ ) {
+ for (i = 0; i < num_channels; i++ ) {
channel_type = tvb_get_guint8(tvb, offset);
proto_tree_add_text(tree, tvb, offset, 1,
"Type: %s [%d]", val_to_str_const(channel_type, channel_types_vs, "Unknown"), channel_type);
diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c
index 8ac904f286..2b13aa977d 100644
--- a/epan/dissectors/packet-ua3g.c
+++ b/epan/dissectors/packet-ua3g.c
@@ -1189,8 +1189,11 @@ decode_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo
}
case 0x05: /* START TONE */
{
- guint8 i, tone_nb_entries, tone_direction, tone_id;
-/* guint8 i, tone_nb_entries, tone_direction, tone_id, tone_duration tone_silence; */
+ guint8 ii, tone_nb_entries;
+ guint8 tone_direction, tone_id;
+#if 0
+ guint8 tone_direction, tone_id, tone_duration tone_silence; */
+#endif
int tone_duration;
static const value_string str_tone_direction[] = {
{0x00, "On The Phone"},
@@ -1199,7 +1202,7 @@ decode_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo
{0, NULL}
};
- tone_direction = tvb_get_guint8(tvb, offset) & 0xC0;
+ tone_direction = tvb_get_guint8(tvb, offset) & 0xC0;
tone_nb_entries = tvb_get_guint8(tvb, offset);
proto_tree_add_text(ua3g_body_tree, tvb, offset, 1,
@@ -1209,7 +1212,7 @@ decode_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo
length--;
while (length > 0 && tone_nb_entries) {
- for (i = 1; i <= tone_nb_entries; i++) {
+ for (ii = 0; ii < tone_nb_entries; ii++) {
tone_id = tvb_get_guint8(tvb, offset);
tone_duration = tvb_get_ntohs(tvb, offset + 1);
#if 0
@@ -1220,10 +1223,10 @@ decode_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo
ua3g_param_item = proto_tree_add_text(ua3g_body_tree, tvb, offset, 6,
#if 0
"Tone Pair %d: Id: %d, Duration: %d ms, Silence: %d ms",
- i, tone_id, tone_duration, tone_silence);
+ ii+1, tone_id, tone_duration, tone_silence);
#endif
"Tone Pair %d: Id: %d, Duration: %d ms",
- i, tone_id, tone_duration);
+ ii+1, tone_id, tone_duration);
ua3g_param_tree = proto_item_add_subtree(ua3g_param_item, ett_ua3g_param);
proto_tree_add_text(ua3g_param_tree, tvb, offset, 1,
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index c45e2d047b..9a4260cf38 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -1474,7 +1474,7 @@ vnc_client_set_encodings(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
per_packet_info->preferred_encoding = -1;
- for(counter = 1; counter <= number_of_encodings; counter++) {
+ for(counter = 0; counter < number_of_encodings; counter++) {
proto_tree_add_item(tree,
hf_vnc_client_set_encodings_encoding_type,
tvb, *offset, 4, ENC_BIG_ENDIAN);
@@ -1604,7 +1604,7 @@ static guint
vnc_server_framebuffer_update(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
proto_tree *tree)
{
- gint i;
+ gint ii;
guint16 num_rects, width, height;
guint bytes_needed = 0;
guint32 encoding_type;
@@ -1632,10 +1632,10 @@ vnc_server_framebuffer_update(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
*/
VNC_BYTES_NEEDED((guint)12*num_rects);
- for(i = 1; i <= num_rects; i++) {
+ for(ii = 0; ii < num_rects; ii++) {
ti = proto_tree_add_text(tree, tvb, *offset, 12,
- "Rectangle #%d", i);
+ "Rectangle #%d", ii+1);
vnc_rect_tree =
proto_item_add_subtree(ti, ett_vnc_rect);
@@ -1773,8 +1773,8 @@ vnc_extended_desktop_size(tvbuff_t *tvb, gint *offset, proto_tree *tree)
VNC_BYTES_NEEDED((guint32)(3 + (num_of_screens * 16)));
*offset += 3;
- for(i = 1; i <= num_of_screens; i++) {
- ti = proto_tree_add_text(tree, tvb, *offset, 16, "Screen #%u", i);
+ for(i = 0; i < num_of_screens; i++) {
+ ti = proto_tree_add_text(tree, tvb, *offset, 16, "Screen #%u", i+1);
screen_tree = proto_item_add_subtree(ti, ett_vnc_desktop_screen);
proto_tree_add_item(screen_tree, hf_vnc_desktop_screen_id, tvb, *offset, 4, ENC_BIG_ENDIAN);
@@ -1861,10 +1861,10 @@ vnc_rre_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
*/
bytes_needed = bytes_per_pixel + 8;
VNC_BYTES_NEEDED(bytes_needed * num_subrects);
- for(i = 1; i <= num_subrects; i++) {
+ for(i = 0; i < num_subrects; i++) {
ti = proto_tree_add_text(tree, tvb, *offset, bytes_per_pixel +
- 8, "Subrectangle #%d", i);
+ 8, "Subrectangle #%d", i+1);
subrect_tree =
proto_item_add_subtree(ti, ett_vnc_rre_subrect);
@@ -1990,10 +1990,10 @@ vnc_hextile_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
num_subrects_tree =
proto_item_add_subtree(ti, ett_vnc_hextile_num_subrects);
- for(i = 1; i <= num_subrects; i++) {
+ for(i = 0; i < num_subrects; i++) {
ti = proto_tree_add_text(num_subrects_tree, tvb,
*offset, subrect_len,
- "Subrectangle #%d", i);
+ "Subrectangle #%d", i+1);
subrect_tree =
proto_item_add_subtree(ti, ett_vnc_hextile_subrect);
@@ -2442,10 +2442,10 @@ vnc_server_set_colormap_entries(tvbuff_t *tvb, packet_info *pinfo, gint *offset,
vnc_colormap_num_groups =
proto_item_add_subtree(ti, ett_vnc_colormap_num_groups);
- for(counter = 1; counter <= number_of_colors; counter++) {
+ for(counter = 0; counter < number_of_colors; counter++) {
ti = proto_tree_add_text(vnc_colormap_num_groups, tvb,
*offset, 6,
- "Color group #%d", counter);
+ "Color group #%d", counter+1);
vnc_colormap_color_group =
proto_item_add_subtree(ti,
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 15:47:48 +0000