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
This commit is contained in:
Bill Meier 2011-03-07 03:10:51 +00:00
parent b71ec510e1
commit 3e92ea5c2f
1 changed files with 4 additions and 4 deletions

View File

@ -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);