diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2010-06-09 15:35:08 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2010-06-09 15:35:08 +0000 |
| commit | 7a29877cc2db9104f4864c6cf2fc736b4491e8e3 (patch) | |
| tree | 6936875f9df036b5b19e5c70a408e38a0a2747c9 /epan/dissectors/packet-idmp.c | |
| parent | aae93d19d49100ee8edae2cdfa46cb5dd0c550a1 (diff) | |
Removal of (hopefully!) the final warning.
svn path=/trunk/; revision=33187
Diffstat (limited to 'epan/dissectors/packet-idmp.c')
| -rw-r--r-- | epan/dissectors/packet-idmp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c index 3514eaf4fe..ebe7cc1551 100644 --- a/epan/dissectors/packet-idmp.c +++ b/epan/dissectors/packet-idmp.c @@ -625,7 +625,7 @@ register_idmp_protocol_info(const char *oid, const ros_info_t *rinfo, int proto } -static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) +static void dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) { int offset = 0; @@ -717,11 +717,8 @@ static int dissect_idmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr offset = dissect_idmp_IDM_PDU(FALSE, tvb, offset, &asn1_ctx, tree, hf_idmp_PDU); pinfo->private_data = save_private_data; - } else { - offset = tvb_length(tvb); - } + } - return offset; } static guint get_idmp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) @@ -935,7 +932,7 @@ void proto_register_idmp(void) { NULL, HFILL }}, /*--- End of included file: packet-idmp-hfarr.c ---*/ -#line 324 "packet-idmp-template.c" +#line 321 "packet-idmp-template.c" }; /* List of subtrees */ @@ -958,7 +955,7 @@ void proto_register_idmp(void) { &ett_idmp_InvokeId, /*--- End of included file: packet-idmp-ettarr.c ---*/ -#line 332 "packet-idmp-template.c" +#line 329 "packet-idmp-template.c" }; module_t *idmp_module; |