diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-08-23 04:45:56 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-08-23 04:45:56 +0000 |
| commit | e835108dda5e3c209f3e34933e8cf0b8d9251959 (patch) | |
| tree | 4c88d6749a01be4dbed9926a6fc99d3339ca1899 /epan/dissectors/packet-llrp.c | |
| parent | 0ab69297216be8f95ba90657e6313f652ec3c7c8 (diff) | |
Get rid of unnecessary function pointer - just directly call the
function in the switch statement. This keeps us from calling through an
uninitialized pointer for custome parameter numbers other than
LLRP_VENDOR_IMPINJ (as warned of by at least some compilers).
svn path=/trunk/; revision=44624
Diffstat (limited to 'epan/dissectors/packet-llrp.c')
| -rw-r--r-- | epan/dissectors/packet-llrp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index e47bca3ed3..14a33630fb 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -1684,8 +1684,6 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint num; proto_item *ti; proto_tree *param_tree; - guint (*dissect_custom_parameter)(tvbuff_t *tvb, - packet_info *pinfo, proto_tree *tree, guint offset, guint param_end); while (((gint)(end - offset)) > 0) { @@ -2208,10 +2206,9 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, PARAM_TREE_ADD(vendor_id, 4, ENC_BIG_ENDIAN); switch(num) { case LLRP_VENDOR_IMPINJ: - dissect_custom_parameter = dissect_llrp_impinj_parameter; + suboffset = dissect_llrp_impinj_parameter(tvb, pinfo, param_tree, suboffset, param_end); break; } - suboffset = dissect_custom_parameter(tvb, pinfo, param_tree, suboffset, param_end); break; } /* Have we decoded exactly the number of bytes declared in the parameter? */ |