aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-03-07 03:10:51 +0000
committerBill Meier <wmeier@newsguy.com>2011-03-07 03:10:51 +0000
commit3e92ea5c2fe6e938c7d9fff0c8cb4ac6dcdddad8 (patch)
tree4aefc49635a762374ecdbc2f4abc6bdcde83e085 /epan
parentb71ec510e11ab74466e60bd389d99f294aaa8d19 (diff)
Fix compiler error on Windows 64: cast strlen() to (int);
Also: Apparently the length of an address of type AT_STRINGZ must include the NULL. svn path=/trunk/; revision=36151
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-dvbci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 078d13fa32..eefe4ed97c 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -1351,12 +1351,12 @@ dissect_dvbci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (IS_DATA_TRANSFER(event)) {
if (event == DATA_HOST_TO_CAM) {
- SET_ADDRESS(&pinfo->src, AT_STRINGZ, strlen(ADDR_HOST), ADDR_HOST);
- SET_ADDRESS(&pinfo->dst, AT_STRINGZ, strlen(ADDR_CAM), ADDR_CAM);
+ SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_HOST)+1, ADDR_HOST);
+ SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_CAM)+1 , ADDR_CAM);
}
else {
- SET_ADDRESS(&pinfo->src, AT_STRINGZ, strlen(ADDR_CAM), ADDR_CAM);
- SET_ADDRESS(&pinfo->dst, AT_STRINGZ, strlen(ADDR_HOST), ADDR_HOST);
+ SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_CAM)+1 , ADDR_CAM);
+ SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_HOST)+1, ADDR_HOST);
}
payload_tvb = tvb_new_subset( tvb, offset, -1, -1);