diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-16 12:36:22 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-16 12:36:22 +0000 |
| commit | 8b515e9340f9eb93c79b74d129b1fddfb8e5299a (patch) | |
| tree | 4a92d1e15649b285aa970ae51790d8e6747ca258 /plugins/profinet | |
| parent | fe6f8b92c7f1f72a0eb677f01899f1dfa07b5342 (diff) | |
Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
Diffstat (limited to 'plugins/profinet')
| -rw-r--r-- | plugins/profinet/packet-dcom-cba-acco.c | 4 | ||||
| -rw-r--r-- | plugins/profinet/packet-pn-mrp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 83bf8e6cbf..adf1c8953b 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -3266,7 +3266,7 @@ dissect_ICBAAccoCallback_OnDataChanged_rqst(tvbuff_t *tvb, int offset, /*** the data below is NOT ndr encoded (especially NOT aligned)!!! ***/ /* dissect PROFINET component data (without header) */ - next_tvb = tvb_new_subset(tvb, offset, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, offset); offset += dissect_CBA_Connection_Data(next_tvb, pinfo, tree, cons_ldev, NULL /* frame */); @@ -3424,7 +3424,7 @@ dissect_ICBAAccoServer2_GetConnectionData_resp(tvbuff_t *tvb, int offset, /*** the data below is NOT ndr encoded (especially NOT aligned)!!! ***/ /* dissect PROFINET component data (without header) */ - next_tvb = tvb_new_subset(tvb, offset, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, offset); offset += dissect_CBA_Connection_Data(next_tvb, pinfo, tree, (call != NULL) ? *call : NULL, NULL /* frame */); diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index 2f03ef73d6..2aff5279c4 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -326,7 +326,7 @@ dissect_PNMRP_PDU(tvbuff_t *tvb, int offset, /* the rest of the packet has 4byte alignment regarding to the beginning of the next TLV block! */ /* XXX - do we have to free this new tvb below? */ - tvb_new = tvb_new_subset(tvb, offset, -1, -1); + tvb_new = tvb_new_subset_remaining(tvb, offset); offset = 0; for(i=0; tvb_length_remaining(tvb, offset) > 0; i++) { |