diff options
| author | Evan Huus <eapache@gmail.com> | 2014-02-20 18:51:46 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-02-20 23:53:35 +0000 |
| commit | dd4daf5024439a1e91f3deb7ec279196c46173a2 (patch) | |
| tree | 5fb504664c3483d6b348c4163ac65480e4e49ece /epan/dissectors/packet-adb_cs.c | |
| parent | 3b57455b716a339a2cce8cbfebb15aaf1a8d89ed (diff) | |
Try a simpler method of fixing 32/64 issues
It appears we're only working on four chars anyways, so the cast to gint should
be safe.
Reverts 602d7d3d39f26b06bcfa25bf9580cfd652a7eee7
Change-Id: Ice101fea7dd7fe4cc65f0d673210c0c791cbe1c5
Reviewed-on: https://code.wireshark.org/review/277
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-adb_cs.c')
| -rw-r--r-- | epan/dissectors/packet-adb_cs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index d0e733f191..65ed7305d8 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -140,7 +140,7 @@ void proto_reg_handoff_adb_cs(void); static gint -dissect_ascii_data_length(proto_tree *tree, tvbuff_t *tvb, gint offset, gint64 *data_length) +dissect_ascii_data_length(proto_tree *tree, tvbuff_t *tvb, gint offset, gint *data_length) { proto_item *sub_item; proto_tree *sub_tree; @@ -153,7 +153,7 @@ dissect_ascii_data_length(proto_tree *tree, tvbuff_t *tvb, gint offset, gint64 * sub_item = proto_tree_add_item(tree, hf_hex_ascii_length, tvb, offset, 4, ENC_NA | ENC_ASCII); sub_tree = proto_item_add_subtree(sub_item, ett_length); - *data_length = g_ascii_strtoull(hex_ascii, NULL, 16); + *data_length = (gint)g_ascii_strtoull(hex_ascii, NULL, 16); proto_tree_add_uint(sub_tree, hf_length, tvb, offset, 4, *data_length); offset += 4; @@ -169,7 +169,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree *sub_tree; proto_item *p_item; gint offset = 0; - gint64 length = -1; + gint length = -1; guint8 *hex_ascii; gboolean client_request_service = FALSE; @@ -229,7 +229,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ g_ascii_xdigit_value(hex_ascii_length[3]) >= 0) { /* probably 4 bytes ascii hex length field */ offset = dissect_ascii_data_length(main_tree, tvb, offset, &length); - col_append_fstr(pinfo->cinfo, COL_INFO, " Length=%" G_GUINT64_FORMAT, length); + col_append_fstr(pinfo->cinfo, COL_INFO, " Length=%u", length); } } @@ -409,7 +409,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ if (g_strcmp0(service, "host:version") == 0) { guint version; - gint64 data_length; + gint data_length; offset = dissect_ascii_data_length(main_tree, tvb, offset, &data_length); @@ -427,7 +427,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ } else if (g_strcmp0(service, "host:devices") == 0 || g_strcmp0(service, "host:devices-l") == 0 || g_strcmp0(service, "host:track-devices") == 0) { - gint64 data_length; + gint data_length; offset = dissect_ascii_data_length(main_tree, tvb, offset, &data_length); @@ -440,7 +440,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ g_strcmp0(service, "host:get-devpath") == 0 || g_str_has_prefix(service, "connect:") || g_str_has_prefix(service, "disconnect:")) { - gint64 data_length; + gint data_length; offset = dissect_ascii_data_length(main_tree, tvb, offset, &data_length); @@ -578,7 +578,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ } } } else if (g_strcmp0(service, "track-jdwp") == 0) { - gint64 data_length; + gint data_length; offset = dissect_ascii_data_length(main_tree, tvb, offset, &data_length); |