changeset 11515:f8a447af7494

[gaim-migrate @ 13760] More compile warning fixes! We're almost warn free, I think? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 11 Sep 2005 16:57:01 +0000
parents 4aa1de1f5545
children 4d2d3104c92f
files src/protocols/bonjour/.cvsignore src/protocols/bonjour/bonjour.c src/protocols/bonjour/dns_sd.c src/protocols/bonjour/jabber.c
diffstat 4 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/protocols/bonjour/.cvsignore	Sun Sep 11 16:57:01 2005 +0000
@@ -0,0 +1,11 @@
+Makefile.in
+Makefile
+.deps
+.libs
+*.lo
+*.la
+*.dll
+*.def
+*.lib
+*.swp
+*.swo
--- a/src/protocols/bonjour/bonjour.c	Sun Sep 11 16:36:45 2005 +0000
+++ b/src/protocols/bonjour/bonjour.c	Sun Sep 11 16:57:01 2005 +0000
@@ -309,7 +309,6 @@
 	NULL,                                                    /* rem_permit */
 	NULL,                                                    /* rem_deny */
 	NULL,                                                    /* set_permit_deny */
-	NULL,                                                    /* warn */
 	NULL,                                                    /* join_chat */
 	NULL,                                                    /* reject_chat */
 	NULL,                                                    /* get_chat_name */
--- a/src/protocols/bonjour/dns_sd.c	Sun Sep 11 16:36:45 2005 +0000
+++ b/src/protocols/bonjour/dns_sd.c	Sun Sep 11 16:57:01 2005 +0000
@@ -102,7 +102,7 @@
 	// Obtain the parameters from the text_record
 	if ((text_record_len > 0) && (text_record) && (*text_record != '\0')) {
 		sw_text_record_iterator_init(&iterator, text_record, text_record_len);
-		while (sw_text_record_iterator_next(iterator, key, value, &value_length) == SW_OKAY) {
+		while (sw_text_record_iterator_next(iterator, key, (sw_octet *)value, &value_length) == SW_OKAY) {
 			// Compare the keys with the possible ones and save them on 
 			// the appropiate place of the buddy_list
 			if (strcmp(key, "txtvers") == 0) {
--- a/src/protocols/bonjour/jabber.c	Sun Sep 11 16:36:45 2005 +0000
+++ b/src/protocols/bonjour/jabber.c	Sun Sep 11 16:57:01 2005 +0000
@@ -348,7 +348,7 @@
 {
 	GaimBuddy* gb = NULL;
 	struct sockaddr_in their_addr; // connector's address information
-	int sin_size = sizeof(struct sockaddr);
+	socklen_t sin_size = sizeof(struct sockaddr);
 	int client_socket;
 	BonjourBuddy* bb = NULL;
 	char* address_text = NULL;