aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tpncp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-06-19 17:18:16 +0000
committerMichael Mann <mmann78@netscape.net>2014-06-19 18:25:59 +0000
commit14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch)
treebdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-tpncp.c
parent3557ac4ec688b86ec7819005a3a181600e056251 (diff)
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tpncp.c')
-rw-r--r--epan/dissectors/packet-tpncp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index a1c8f34ccb..f75cbf6a50 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -155,7 +155,7 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_item *item,
case 1: case 2: case 3: case 4:
case 5: case 6: case 7: case 8:
if ((g_str_len = current_tpncp_data_field_info->tpncp_data_field_array_dim)) { /* add char array */
- g_str_len = MIN(g_str_len, tvb_captured_length_remaining(tvb, *offset));
+ g_str_len = MIN(g_str_len, tvb_length_remaining(tvb, *offset));
proto_tree_add_item(ltree, current_tpncp_data_field_info->tpncp_data_field_descr,
tvb, *offset, g_str_len, ENC_NA|ENC_ASCII);
(*offset) += g_str_len;
@@ -220,7 +220,7 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_item *item,
break;
}
current_tpncp_data_field_info = current_tpncp_data_field_info->p_next;
- if (tvb_captured_length_remaining(tvb, *offset) <= 0) {
+ if (tvb_length_remaining(tvb, *offset) <= 0) {
break;
}
}
@@ -319,7 +319,7 @@ static int dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
}
}
- return tvb_captured_length(tvb);
+ return tvb_length(tvb);
}
/*-------------------------------------------------------------------------------------------------------------------------------------------*/
@@ -345,7 +345,7 @@ static int dissect_tpncp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
/* Otherwise use the regular dissector (might not give correct dissection). */
dissect_tpncp(tvb, pinfo, tree, data);
- return tvb_captured_length(tvb);
+ return tvb_length(tvb);
}
/*-------------------------------------------------------------------------------------------------------------------------------------------*/