Changes in / [764b0aba:64d1f45]
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
ipc.c
r764b0aba r64d1f45 507 507 } 508 508 509 if (bind(serversock, (struct sockaddr *)&un_addr, sizeof(un_addr)) == -1) {509 if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) { 510 510 log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) ); 511 511 return 0; -
protocols/jabber/xmlparse.c
r764b0aba r64d1f45 1461 1461 s = protocolEncodingName; 1462 1462 #endif 1463 if ( ns ? XmlInitEncodingNS(&initEncoding, &encoding, s) : XmlInitEncoding(&initEncoding, &encoding, s))1463 if ((ns ? XmlInitEncodingNS : XmlInitEncoding)(&initEncoding, &encoding, s)) 1464 1464 return XML_ERROR_NONE; 1465 1465 return handleUnknownEncoding(parser, protocolEncodingName); … … 1475 1475 int standalone = -1; 1476 1476 if (!(ns 1477 ? XmlParseXmlDeclNS(isGeneralTextEntity, 1477 ? XmlParseXmlDeclNS 1478 : XmlParseXmlDecl)(isGeneralTextEntity, 1478 1479 encoding, 1479 1480 s, … … 1483 1484 &encodingName, 1484 1485 &newEncoding, 1485 &standalone) 1486 : XmlParseXmlDecl(isGeneralTextEntity, 1487 encoding, 1488 s, 1489 next, 1490 &eventPtr, 1491 &version, 1492 &encodingName, 1493 &newEncoding, 1494 &standalone))) 1486 &standalone)) 1495 1487 return XML_ERROR_SYNTAX; 1496 1488 if (!isGeneralTextEntity && standalone == 1) … … 1545 1537 } 1546 1538 enc = (ns 1547 ? XmlInitUnknownEncodingNS(unknownEncodingMem, 1539 ? XmlInitUnknownEncodingNS 1540 : XmlInitUnknownEncoding)(unknownEncodingMem, 1548 1541 info.map, 1549 1542 info.convert, 1550 info.data) 1551 : XmlInitUnknownEncoding(unknownEncodingMem, 1552 info.map, 1553 info.convert, 1554 info.data)); 1543 info.data); 1555 1544 if (enc) { 1556 1545 unknownEncodingData = info.data; -
protocols/oscar/oscar_util.c
r764b0aba r64d1f45 109 109 110 110 curPtr = sn; 111 while ( (*curPtr) != (char) '\0') {111 while ( (*curPtr) != (char) NULL) { 112 112 if ((*curPtr) != ' ') 113 113 i++; … … 140 140 curPtr1 = sn1; 141 141 curPtr2 = sn2; 142 while ( (*curPtr1 != (char) '\0') && (*curPtr2 != (char) '\0') ) {142 while ( (*curPtr1 != (char) NULL) && (*curPtr2 != (char) NULL) ) { 143 143 if ( (*curPtr1 == ' ') || (*curPtr2 == ' ') ) { 144 144 if (*curPtr1 == ' ')
Note: See TracChangeset
for help on using the changeset viewer.