aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-ppp.c10
-rw-r--r--epan/dissectors/packet-sametime.c32
-rw-r--r--wiretap/pcapng.c1
3 files changed, 15 insertions, 28 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index fe683819a6..6c69930e6d 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -3492,7 +3492,6 @@ dissect_vsncp_pdnid_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
PDNID = tvb_get_guint8(tvb, offset + 2);
proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%02x", optp->name,
PDNID);
- offset += 2;
}
static void
@@ -3512,7 +3511,6 @@ dissect_vsncp_attachtype_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
optp->name, val_to_str_const(attach , attach_vals, "Unknown"),
attach);
}
- offset += 2;
}
static void
@@ -3533,7 +3531,6 @@ dissect_vsncp_pdntype_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
optp->name, val_to_str_const(pdntype, pdntype_vals, "Unknown"),
pdntype);
}
- offset += 2;
}
static void
@@ -3563,7 +3560,6 @@ dissect_vsncp_errorcode_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
optp->name, val_to_str_const(pdntype, errorcode_vals, "Unknown"),
pdntype);
}
- offset += 2;
}
static void
@@ -3625,7 +3621,6 @@ dissect_vsncp_pdnaddress_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
default:
break;
}
- offset += 2;
}
static void
@@ -3634,7 +3629,6 @@ dissect_vsncp_ipv4address_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
{
proto_tree_add_text(tree, tvb, offset, length, "%s: %s", optp->name,
tvb_ip_to_str(tvb, offset + 2));
- offset += 2;
}
static void
@@ -3684,7 +3678,6 @@ dissect_vsncp_addressalloc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
proto_tree_add_text(tree, tvb, offset, length, "%s: %s (0x%02x)",
optp->name, val_to_str_const(alloc, alloc_vals, "Unknown"), alloc);
}
- offset += 2;
}
static void
@@ -5213,7 +5206,6 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(data_tree, hf_pap_password, tvb, offset,
password_length, ENC_ASCII|ENC_NA);
password = tvb_format_text(tvb, offset, password_length);
- offset += password_length;
col_append_fstr(pinfo->cinfo, COL_INFO,
" (Peer-ID='%s', Password='%s')", peer_id, password);
@@ -5229,7 +5221,6 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(data_tree, hf_pap_message, tvb, offset,
message_length, ENC_ASCII|ENC_NA);
message = tvb_format_text(tvb, offset, message_length);
- offset += message_length;
col_append_fstr(pinfo->cinfo, COL_INFO, " (Message='%s')",
message);
@@ -6794,4 +6785,3 @@ proto_reg_handoff_iphc_crtp(void)
* vi: set shiftwidth=4 tabstop=4 expandtab:
* :indentSize=4:tabSize=4:noTabs=true:
*/
-
diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c
index 7e91435e99..1a6d133c4b 100644
--- a/epan/dissectors/packet-sametime.c
+++ b/epan/dissectors/packet-sametime.c
@@ -254,7 +254,7 @@ dissect_set_user_status(tvbuff_t *tvb, proto_tree *tree, int offset)
offset += 2;
proto_tree_add_item(tree, hf_sametime_time, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
return user_status;
}
@@ -294,7 +294,7 @@ dissect_handshake_ack(tvbuff_t *tvb, proto_tree *tree, int offset)
offset += 4;
offset += 4;
offset += 4;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
@@ -302,7 +302,7 @@ static void
dissect_login(tvbuff_t *tvb, proto_tree *tree, int offset)
{
offset += 2;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
@@ -310,7 +310,7 @@ static void
dissect_login_redirect(tvbuff_t *tvb, proto_tree *tree, int offset)
{
offset += 2;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
@@ -329,7 +329,7 @@ dissect_login_ack(tvbuff_t *tvb, proto_tree *tree, int offset)
offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
offset += 21;
offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
@@ -343,7 +343,7 @@ dissect_channel_create(tvbuff_t *tvb, proto_tree *tree, int offset)
proto_tree_add_item(tree, hf_sametime_channel_service, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
offset += 8;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
@@ -365,7 +365,7 @@ dissect_channel_send(tvbuff_t *tvb, proto_tree *tree, int offset)
proto_item_append_text(tree, ", %s", val_to_str(awareness, awarenessnames, "0x%04x"));
proto_tree_add_item(tree, hf_sametime_channel_awareness, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
break;
@@ -381,9 +381,9 @@ dissect_channel_send(tvbuff_t *tvb, proto_tree *tree, int offset)
offset += add_text_item(tvb, tree, offset, hf_sametime_location_phone);
offset += 1;
offset += add_text_item(tvb, tree, offset, hf_sametime_location_name);
- offset += add_text_item(tvb, tree, offset, hf_sametime_location_timezone);
+ add_text_item(tvb, tree, offset, hf_sametime_location_timezone);
} else {
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
break;
@@ -407,7 +407,7 @@ dissect_channel_send(tvbuff_t *tvb, proto_tree *tree, int offset)
proto_item_append_text(tree, ", %s", val_to_str(awareness, awarenessnames, "0x%04x"));
proto_tree_add_item(tree, hf_sametime_channel_awareness, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
break;
@@ -430,7 +430,7 @@ dissect_channel_send(tvbuff_t *tvb, proto_tree *tree, int offset)
case 0x0000:
offset += 14;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
break;
@@ -438,14 +438,14 @@ dissect_channel_send(tvbuff_t *tvb, proto_tree *tree, int offset)
offset += 8;
offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
offset += 3;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
break;
case 0x0005: /* XML */
if (26 <= tvb_reported_length_remaining(tvb, offset + 2)) {
offset += 26;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
break;
@@ -457,14 +457,14 @@ dissect_channel_send(tvbuff_t *tvb, proto_tree *tree, int offset)
offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
offset += 3;
offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
}
break;
case 0x025a:
offset += 10;
- offset += add_text_item(tvb, tree, offset, hf_sametime_field_text);
+ add_text_item(tvb, tree, offset, hf_sametime_field_text);
break;
@@ -499,7 +499,6 @@ dissect_sense_service(tvbuff_t *tvb, proto_tree *tree, int offset)
code = tvb_get_ntohl(tvb, offset);
proto_item_append_text(tree, ", %s", val_to_str(code, codenames, "0x%04x"));
proto_tree_add_item(tree, hf_sametime_code, tvb, offset, 4, ENC_BIG_ENDIAN);
- offset += 4;
}
@@ -934,4 +933,3 @@ proto_reg_handoff_sametime(void)
dissector_add_uint("tcp.port", global_sametime_port, sametime_handle);
saved_sametime_tcp_port = global_sametime_port;
}
-
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 17d0cb887c..ceef797be0 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -3334,7 +3334,6 @@ pcapng_write_name_resolution_block(wtap_dumper *wdh, pcapng_dump_t *pcapng, int
rec_off += 4;
memcpy(rec_data + rec_off, &bh.block_total_length, sizeof(bh.block_total_length));
- rec_off += 4;
pcapng_debug2("pcapng_write_name_resolution_block: Write bh.block_total_length bytes %d, rec_off %u", bh.block_total_length, rec_off);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 23:23:58 +0000