Changeset 41ca004
- Timestamp:
- 2006-05-19T07:55:53Z (18 years ago)
- Branches:
- master
- Children:
- 68b518d6
- Parents:
- ac83732 (diff), 881fd4e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
conf.c
rac83732 r41ca004 95 95 conf->port = i; 96 96 } 97 else if( opt == ' p' )97 else if( opt == 'P' ) 98 98 { 99 99 g_free( conf->pidfile ); -
ipc.c
rac83732 r41ca004 508 508 } 509 509 510 if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {510 if (bind(serversock, (struct sockaddr *)&un_addr, sizeof(un_addr)) == -1) { 511 511 log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) ); 512 512 return 0; … … 566 566 ipc_to_children_str( "OPERMSG :New BitlBee master process started (version " BITLBEE_VERSION ")\r\n" ); 567 567 568 fclose( fp ); 568 569 return 1; 569 570 } -
irc.c
rac83732 r41ca004 550 550 551 551 u = user_find( irc, irc->mynick ); 552 i f( u ) is_private = u->is_private;552 is_private = u->is_private; 553 553 554 554 va_start( params, format ); -
protocols/http_client.c
rac83732 r41ca004 69 69 70 70 return( req ); 71 } 72 73 void *http_dorequest_url( char *url_string, http_input_function func, gpointer data ) 74 { 75 url_t *url = g_new0( url_t, 1 ); 76 char *request; 77 void *ret; 78 79 if( !url_set( url, url_string ) ) 80 { 81 g_free( url ); 82 return NULL; 83 } 84 85 if( url->proto != PROTO_HTTP && url->proto != PROTO_HTTPS ) 86 { 87 g_free( url ); 88 return NULL; 89 } 90 91 request = g_strdup_printf( "GET %s HTTP/1.0\r\n" 92 "Host: %s\r\n" 93 "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n" 94 "\r\n", url->file, url->host ); 95 96 ret = http_dorequest( url->host, url->port, 97 url->proto == PROTO_HTTPS, request, func, data ); 98 99 g_free( url ); 100 g_free( request ); 101 return ret; 71 102 } 72 103 … … 222 253 evil_server = 1; 223 254 } 224 else 255 else if( end1 ) 225 256 { 226 257 end1 += 2; 227 258 } 228 229 if( end1 ) 230 { 231 *end1 = 0; 232 233 if( evil_server ) 234 req->reply_body = end1 + 1; 235 else 236 req->reply_body = end1 + 2; 237 } 259 else 260 { 261 goto cleanup; 262 } 263 264 *end1 = 0; 265 266 if( evil_server ) 267 req->reply_body = end1 + 1; 268 else 269 req->reply_body = end1 + 2; 270 271 req->body_size = req->reply_headers + req->bytes_read - req->reply_body; 238 272 239 273 if( ( end1 = strchr( req->reply_headers, ' ' ) ) != NULL ) -
protocols/http_client.h
rac83732 r41ca004 39 39 char *reply_headers; 40 40 char *reply_body; 41 int body_size; 41 42 int finished; 42 43 … … 53 54 54 55 void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data ); 56 void *http_dorequest_url( char *url_string, http_input_function func, gpointer data ); -
protocols/jabber/jabber.c
rac83732 r41ca004 1553 1553 if(jd->gjc != NULL) { 1554 1554 gjab_delete(jd->gjc); 1555 /* YAY for modules with their own memory pool managers!... 1555 1556 g_free(jd->gjc->sid); 1557 And a less sarcastic yay for valgrind. :-) */ 1556 1558 jd->gjc = NULL; 1557 1559 } -
protocols/jabber/xmlparse.c
rac83732 r41ca004 1461 1461 s = protocolEncodingName; 1462 1462 #endif 1463 if ( (ns ? XmlInitEncodingNS : XmlInitEncoding)(&initEncoding, &encoding, s))1463 if (ns ? XmlInitEncodingNS(&initEncoding, &encoding, s) : 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 1478 : XmlParseXmlDecl)(isGeneralTextEntity, 1477 ? XmlParseXmlDeclNS(isGeneralTextEntity, 1479 1478 encoding, 1480 1479 s, … … 1484 1483 &encodingName, 1485 1484 &newEncoding, 1486 &standalone)) 1485 &standalone) 1486 : XmlParseXmlDecl(isGeneralTextEntity, 1487 encoding, 1488 s, 1489 next, 1490 &eventPtr, 1491 &version, 1492 &encodingName, 1493 &newEncoding, 1494 &standalone))) 1487 1495 return XML_ERROR_SYNTAX; 1488 1496 if (!isGeneralTextEntity && standalone == 1) … … 1537 1545 } 1538 1546 enc = (ns 1539 ? XmlInitUnknownEncodingNS 1540 : XmlInitUnknownEncoding)(unknownEncodingMem, 1547 ? XmlInitUnknownEncodingNS(unknownEncodingMem, 1541 1548 info.map, 1542 1549 info.convert, 1543 info.data); 1550 info.data) 1551 : XmlInitUnknownEncoding(unknownEncodingMem, 1552 info.map, 1553 info.convert, 1554 info.data)); 1544 1555 if (enc) { 1545 1556 unknownEncodingData = info.data; -
protocols/nogaim.c
rac83732 r41ca004 610 610 return; 611 611 } 612 return; 612 /* Why did we have this here.... 613 return; */ 613 614 } 614 615 -
protocols/oscar/oscar_util.c
rac83732 r41ca004 109 109 110 110 curPtr = sn; 111 while ( (*curPtr) != (char) NULL) {111 while ( (*curPtr) != (char) '\0') { 112 112 if ((*curPtr) != ' ') 113 113 i++; … … 140 140 curPtr1 = sn1; 141 141 curPtr2 = sn2; 142 while ( (*curPtr1 != (char) NULL) && (*curPtr2 != (char) NULL) ) {142 while ( (*curPtr1 != (char) '\0') && (*curPtr2 != (char) '\0') ) { 143 143 if ( (*curPtr1 == ' ') || (*curPtr2 == ' ') ) { 144 144 if (*curPtr1 == ' ') -
protocols/oscar/service.c
rac83732 r41ca004 881 881 #endif 882 882 883 /* len can't be 0 here anyway... 883 884 } else if ((offset == 0x00001000) && (len == 0x00000000)) { 884 885 … … 887 888 aimbs_put32(&fr->data, 0xe9800998); 888 889 aimbs_put32(&fr->data, 0xecf8427e); 889 890 */ 890 891 } else 891 892 do_error_dialog(sess->aux_data, "WARNING: unknown hash request", "Gaim"); -
protocols/yahoo/yahoo.c
rac83732 r41ca004 608 608 struct gaim_connection *gc = byahoo_get_gc_by_id( id ); 609 609 610 serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0, 0, 610 serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0, 611 ( stat == YAHOO_STATUS_IDLE ) ? away : 0, 611 612 ( stat != YAHOO_STATUS_AVAILABLE ) | ( stat << 1 ), 0 ); 612 613 } -
set.c
rac83732 r41ca004 150 150 if( s ) 151 151 { 152 t->next = s->next; 152 if( t ) 153 t->next = s->next; 154 else 155 irc->set = s->next; 156 153 157 g_free( s->key ); 154 158 if( s->value ) g_free( s->value );
Note: See TracChangeset
for help on using the changeset viewer.