diff options
| author | Anders <anders.broman@ericsson.com> | 2015-06-04 14:28:40 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-04 13:32:17 +0000 |
| commit | 8d78077d0d931c6afee6d0e27b5df7c5477e21e5 (patch) | |
| tree | b8f95e3205d242512acdf6407126815ded24dd5c /epan/dissectors/packet-btrfcomm.c | |
| parent | 539418c91732b71985117a01e1db42436baa83cc (diff) | |
| download | wireshark-8d78077d0d931c6afee6d0e27b5df7c5477e21e5.tar.gz | |
[MSVC2015] TRy to fix Warnings turned errors.
Change-Id: I1156e66daad84004f4f7acae0175fcbb475db71a
Reviewed-on: https://code.wireshark.org/review/8760
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
| -rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index eb6c92c226..be7bb17793 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -281,14 +281,9 @@ static void btrfcomm_serv_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_serv_value(packet_info *pinfo) { - gulong *value_data; - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_SERVICE_CONV); + return (gpointer)p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_SERVICE_CONV); - if (value_data) - return (gpointer) *value_data; - - return NULL; } static void btrfcomm_chan_prompt(packet_info *pinfo, gchar* result) @@ -304,14 +299,9 @@ static void btrfcomm_chan_prompt(packet_info *pinfo, gchar* result) static gpointer btrfcomm_chan_value(packet_info *pinfo) { - gulong *value_data; - value_data = (gulong *) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_CHANNEL_CONV); + return (gpointer) p_get_proto_data(pinfo->pool, pinfo, proto_btrfcomm, BTRFCOMM_CHANNEL_CONV); - if (value_data) - return (gpointer) *value_data; - - return NULL; } static dissector_handle_t |