changeset 1859:b1d62fe22d74

[gaim-migrate @ 1869] whoops. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Sat, 19 May 2001 01:48:48 +0000
parents 487d98cdbe28
children 91a74da87252
files src/oscar.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/oscar.c	Sat May 19 01:46:55 2001 +0000
+++ b/src/oscar.c	Sat May 19 01:48:48 2001 +0000
@@ -169,9 +169,9 @@
 	char *tmp;
 	int i, j;
 	char *x = strchr(name, '-');
-	if (!x) return;
+	if (!x) return NULL;
 	x = strchr(++x, '-');
-	if (!x) return;
+	if (!x) return NULL;
 	tmp = g_strdup(++x);
 
 	for (i = 0, j = 0; x[i]; i++) {
@@ -182,7 +182,7 @@
 			hex[0] = x[++i];
 			hex[1] = x[++i];
 			hex[2] = 0;
-			sscanf(hex, "%x", &tmp[j++]);
+			sscanf(hex, "%x", (int *)&tmp[j++]);
 		}
 	}
 
@@ -2297,7 +2297,6 @@
 
 static void oscar_chat_send(struct gaim_connection *g, int id, char *message) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-	struct aim_conn_t *cn; 
 	GSList *bcs = g->buddy_chats;
 	struct conversation *b = NULL;
 	struct chat_connection *c = NULL;