aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2007-03-27 23:33:59 +0000
committerStephen Fisher <steve@stephen-fisher.com>2007-03-27 23:33:59 +0000
commitfa3af74ba7170a0e76ce9dd56f29c1f553c71b4a (patch)
treeb36110afc68a7ba9397b69c7f4c504f922ad36c9
parent8dabc0ded152882834b7c2e53ea46744fce562ba (diff)
Fix a warning in packet-bittorrent.c I didn't fix right the first time and try to get the Win32 buildbot going again in packet-ndmp.c.
svn path=/trunk/; revision=21238
-rw-r--r--epan/dissectors/packet-bittorrent.c2
-rw-r--r--epan/dissectors/packet-ndmp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 1806671bcd..a299a0792f 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -711,7 +711,7 @@ static void dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo _U_, p
client ids beginning with '-' and 3 characters for the
rest. */
version = tvb_get_string(tvb, offset + strlen(peer_id[i].id),
- ((guint8*)peer_id[i].id[0] == '-') ? 4 : 3);
+ (guint8*)(peer_id[i].id[0] == '-') ? 4 : 3);
proto_tree_add_text(tree, tvb, offset, 20, "Client is %s v%s",
peer_id[i].name,
format_text((guchar*)version, (peer_id[i].id[0] == '-') ? 4 : 3));
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 2410bc2bf4..deb77c0590 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -1358,7 +1358,7 @@ dissect_execute_cdb_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree_add_item(tree, hf_ndmp_execute_cdb_status, tvb, offset, 4, FALSE);
status=tvb_get_ntohl(tvb, offset);
if(ndmp_conv_data->task->itlq){
- dissect_scsi_rsp(tvb, pinfo, top_tree, ndmp_conv_data->task->itlq, get_itl_nexus(ndmp_conv_data, pinfo, FALSE), status);
+ dissect_scsi_rsp(tvb, pinfo, top_tree, ndmp_conv_data->task->itlq, get_itl_nexus(ndmp_conv_data, pinfo, FALSE), (guint8)status);
}
offset += 4;