Changeset 1608 for pjproject/trunk/pjlib/src/pj/os_symbian.h
- Timestamp:
- Dec 2, 2007 3:36:46 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjlib/src/pj/os_symbian.h
r1601 r1608 245 245 pj_addr.addr.sa_family = (pj_uint16_t)sym_addr.Family(); 246 246 if (pj_addr.addr.sa_family == PJ_AF_INET) { 247 PJ_ASSERT_RETURN(*addr_len >=sizeof(pj_sockaddr_in), PJ_ETOOSMALL);247 PJ_ASSERT_RETURN(*addr_len>=(int)sizeof(pj_sockaddr_in), PJ_ETOOSMALL); 248 248 pj_addr.ipv4.sin_addr.s_addr = pj_htonl(sym_addr.Address()); 249 249 pj_addr.ipv4.sin_port = pj_htons((pj_uint16_t) sym_addr.Port()); 250 250 *addr_len = sizeof(pj_sockaddr_in); 251 251 } else if (pj_addr.addr.sa_family == PJ_AF_INET6) { 252 PJ_ASSERT_RETURN(*addr_len >=sizeof(pj_sockaddr_in6), PJ_ETOOSMALL);252 PJ_ASSERT_RETURN(*addr_len>=(int)sizeof(pj_sockaddr_in6), PJ_ETOOSMALL); 253 253 const TIp6Addr & ip6 = sym_addr.Ip6Address(); 254 254 pj_memcpy(&pj_addr.ipv6.sin6_addr, ip6.u.iAddr8, 16); … … 272 272 { 273 273 if (pj_addr.addr.sa_family == PJ_AF_INET) { 274 PJ_ASSERT_RETURN(addrlen >= sizeof(pj_sockaddr_in), PJ_EINVAL);274 PJ_ASSERT_RETURN(addrlen >= (int)sizeof(pj_sockaddr_in), PJ_EINVAL); 275 275 sym_addr.Init(KAfInet); 276 276 sym_addr.SetAddress((TUint32)pj_ntohl(pj_addr.ipv4.sin_addr.s_addr)); … … 279 279 TIp6Addr ip6; 280 280 281 PJ_ASSERT_RETURN(addrlen >=sizeof(pj_sockaddr_in6), PJ_EINVAL);281 PJ_ASSERT_RETURN(addrlen>=(int)sizeof(pj_sockaddr_in6), PJ_EINVAL); 282 282 pj_memcpy(ip6.u.iAddr8, &pj_addr.ipv6.sin6_addr, 16); 283 283 sym_addr.Init(KAfInet6);
Note: See TracChangeset
for help on using the changeset viewer.