pidgin.yaz: src/protocols/oscar/oscar.c comparison

comparison src/protocols/oscar/oscar.c @ 11159:bd8ac1d4b2f2

[gaim-migrate @ 13246] Get rid of a bunch of gcc4 compile warnings in oscar. Here's what I'm doing: -For random bits of binary data, use guchar * -For textual data (not necessarily utf8), use gchar * This seems to be what glib and gtk do committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Tue, 26 Jul 2005 04:34:37 +0000
parents	92453bf9b86b
children	ccb38cf22483

comparison

equal deleted inserted replaced

-:2c930d591492
+:bd8ac1d4b2f2
 static int oscar_sendfile_ack    (aim_session_t *, aim_frame_t *, ...);
 static int oscar_sendfile_done   (aim_session_t *, aim_frame_t *, ...);
 static gboolean gaim_icon_timerfunc(gpointer data);
 static void oscar_callback(gpointer data, gint source, GaimInputCondition condition);
-static void oscar_direct_im_initiate(GaimConnection *gc, const char *who, const char *cookie);
+static void oscar_direct_im_initiate(GaimConnection *gc, const char *who, const guchar *cookie);
 static void oscar_set_info(GaimConnection *gc, const char *text);
 static void recent_buddies_cb(const char *name, GaimPrefType type, gpointer value, gpointer data);
 static void oscar_xfer_init_recv(GaimXfer *xfer);
 static void oscar_free_name_data(struct name_data *data) {
 	return utf8;
 }
 static gchar *
-gaim_plugin_oscar_convert_to_utf8(const fu8_t *data, fu16_t datalen, const char *charsetstr, gboolean fallback)
+gaim_plugin_oscar_convert_to_utf8(const gchar *data, gsize datalen, const char *charsetstr, gboolean fallback)
 {
 	gchar *ret = NULL;
 	GError *err = NULL;
 	if ((charsetstr == NULL) || (*charsetstr == '\0'))
 * that don't correctly send non-ASCII messages.  And if Gaim isn't
 * able to deal with that crap, then people complain like banshees.
 * charsetstr1 is always set to what the correct encoding should be.
 */
 static gchar *
-gaim_plugin_oscar_decode_im_part(GaimAccount *account, const char *sourcesn, fu16_t charset, fu16_t charsubset, fu8_t *data, fu16_t datalen)
+gaim_plugin_oscar_decode_im_part(GaimAccount *account, const char *sourcesn, fu16_t charset, fu16_t charsubset, const gchar *data, gsize datalen)
 {
 	gchar *ret = NULL;
 	const gchar *charsetstr1, *charsetstr2;
 	gaim_debug_info("oscar", "Parsing IM part, charset=0x%04hx, charsubset=0x%04hx, datalen=%hd\n", charset, charsubset, datalen);
 	if (source < 0) {
 		if (dim->donttryagain) {
 			oscar_direct_im_disconnect(od, dim);
 			return;
 		} else {
-			fu8_t cookie[8];
+			guchar cookie[8];
 			char *who = g_strdup(dim->name);
-			const char *tmp = aim_odc_getcookie(dim->conn);
+			const guchar *tmp = aim_odc_getcookie(dim->conn);
 			memcpy(cookie, tmp, 8);
 			oscar_direct_im_destroy(od, dim);
 			oscar_direct_im_initiate(gc, who, cookie);
 			gaim_debug_info("oscar", "asking direct im initiator to connect to us\n");
 	} else {
 		if (dim->donttryagain) {
 			oscar_direct_im_disconnect(od, dim);
 			return;
 		} else {
-			fu8_t cookie[8];
+			guchar cookie[8];
 			char *who = g_strdup(dim->name);
-			const char *tmp = aim_odc_getcookie(dim->conn);
+			const guchar *tmp = aim_odc_getcookie(dim->conn);
 			memcpy(cookie, tmp, 8);
 			oscar_direct_im_destroy(od, dim);
 			oscar_direct_im_initiate(gc, who, cookie);
 			gaim_debug_info("oscar", "asking direct im initiator to connect to us\n");
 * this function will also get called if the other side initiate's a direct
 * im and we try to connect and fail. in that case cookie will not be null.
 *
 * note that cookie is an 8 byte string that isn't NULL terminated
 */
-static void oscar_direct_im_initiate(GaimConnection *gc, const char *who, const char *cookie) {
+static void oscar_direct_im_initiate(GaimConnection *gc, const char *who, const guchar *cookie) {
 	OscarData *od;
 	struct oscar_direct_im *dim;
 	int listenfd;
 	const char *ip;
 	aim_oft_destroyinfo(oft_info);
 	xfer->data = NULL;
 	od->file_transfers = g_slist_remove(od->file_transfers, xfer);
 }
-static void oscar_xfer_ack_recv(GaimXfer *xfer, const char *buffer, size_t size)
+static void oscar_xfer_ack_recv(GaimXfer *xfer, const guchar *buffer, size_t size)
 {
 	struct aim_oft_info *oft_info = xfer->data;
 	/* Update our rolling checksum.  Like Walmart, yo. */
 	oft_info->fh.recvcsum = aim_oft_checksum_chunk(buffer, size, oft_info->fh.recvcsum);
 	aim_oft_destroyinfo(oft_info);
 	xfer->data = NULL;
 	od->file_transfers = g_slist_remove(od->file_transfers, xfer);
 }
-static void oscar_xfer_ack_send(GaimXfer *xfer, const char *buffer, size_t size)
+static void oscar_xfer_ack_send(GaimXfer *xfer, const guchar *buffer, size_t size)
 {
 	struct aim_oft_info *oft_info = xfer->data;
 	/* I'm not sure I like how we do this. --marv
 	 * I do.  AIM file transfers aren't really meant to be thought
 	return 1;
 }
 static void gaim_check_comment(OscarData *od, const char *str) {
-	if ((str == NULL) || strcmp(str, ck))
+	if ((str == NULL) || strcmp(str, (const char *)ck))
 		aim_locate_setcaps(od->sess, caps_aim);
 	else
 		aim_locate_setcaps(od->sess, caps_aim | AIM_CAPS_SECUREIM);
 }
 	    (args->icbmflags & AIM_IMFLAGS_BUDDYREQ) && !bi->ico_sent && bi->ico_informed) {
 		FILE *file;
 		struct stat st;
 		if (!g_stat(iconfile, &st)) {
-			char *buf = g_malloc(st.st_size);
+			guchar *buf = g_malloc(st.st_size);
 			file = g_fopen(iconfile, "rb");
 			if (file) {
 				/* XXX - Use g_file_get_contents() */
 				int len = fread(buf, 1, st.st_size, file);
 				gaim_debug_info("oscar",
 	}
 	message = g_string_new("");
 	curpart = args->mpmsg.parts;
 	while (curpart != NULL) {
-		tmp = gaim_plugin_oscar_decode_im_part(account, userinfo->sn, curpart->charset, curpart->charsubset,
+		tmp = gaim_plugin_oscar_decode_im_part(account, userinfo->sn, curpart->charset,
-											curpart->data, curpart->datalen);
+				curpart->charsubset, curpart->data, curpart->datalen);
 		if (tmp != NULL) {
 			g_string_append(message, tmp);
 			g_free(tmp);
 		}
 	g_free(buf);
 	return 1;
 }
-static int gaim_parse_clientauto_ch2(aim_session_t *sess, const char *who, fu16_t reason, const char *cookie) {
+static int gaim_parse_clientauto_ch2(aim_session_t *sess, const char *who, fu16_t reason, const guchar *cookie) {
 	GaimConnection *gc = sess->aux_data;
 	OscarData *od = gc->proto_data;
 /* BBB */
 	switch (reason) {
 	chan = (fu16_t)va_arg(ap, unsigned int);
 	who = va_arg(ap, char *);
 	reason = (fu16_t)va_arg(ap, unsigned int);
 	if (chan == 0x0002) { /* File transfer declined */
-		char *cookie = va_arg(ap, char *);
+		guchar *cookie = va_arg(ap, guchar *);
 		return gaim_parse_clientauto_ch2(sess, who, reason, cookie);
 	} else if (chan == 0x0004) { /* ICQ message */
 		fu32_t state = 0;
 		char *msg = NULL;
 		if (reason == 0x0003) {
 		struct stat st;
 		const char *iconfile = gaim_account_get_buddy_icon(gaim_connection_get_account(gc));
 		if (iconfile == NULL) {
 			aim_ssi_delicon(od->sess);
 		} else if (!g_stat(iconfile, &st)) {
-			char *buf = g_malloc(st.st_size);
+			guchar *buf = g_malloc(st.st_size);
 			FILE *file = g_fopen(iconfile, "rb");
 			if (file) {
 				/* XXX - Use g_file_get_contents()? */
 				fread(buf, 1, st.st_size, file);
 				fclose(file);
 		}
 		if (iconfile && !g_stat(iconfile, &st)) {
 			FILE *file = g_fopen(iconfile, "rb");
 			if (file) {
-				char *buf = g_malloc(st.st_size);
+				guchar *buf = g_malloc(st.st_size);
 				/* XXX - Use g_file_get_contents()? */
 				fread(buf, 1, st.st_size, file);
 				fclose(file);
 				args.iconlen   = st.st_size;
 	GaimConnection *gc = sess->aux_data;
 	OscarData *od = gc->proto_data;
 	va_list ap;
 	fu16_t type;
 	fu8_t flags = 0, length = 0;
-	char *md5 = NULL;
+	guchar *md5 = NULL;
 	va_start(ap, fr);
 	type = va_arg(ap, int);
 	switch(type) {
 		case 0x0000:
 		case 0x0001: {
 			flags = va_arg(ap, int);
 			length = va_arg(ap, int);
-			md5 = va_arg(ap, char *);
+			md5 = va_arg(ap, guchar *);
 			if (flags == 0x41) {
 				if (!aim_getconn_type(od->sess, AIM_CONN_TYPE_ICON) && !od->iconconnecting) {
 					od->iconconnecting = TRUE;
 					od->set_icon = TRUE;
 					struct stat st;
 					const char *iconfile = gaim_account_get_buddy_icon(gaim_connection_get_account(gc));
 					if (iconfile == NULL) {
 						aim_ssi_delicon(od->sess);
 					} else if (!g_stat(iconfile, &st)) {
-						char *buf = g_malloc(st.st_size);
+						guchar *buf = g_malloc(st.st_size);
 						FILE *file = g_fopen(iconfile, "rb");
 						if (file) {
 							/* XXX - Use g_file_get_contents()? */
 							fread(buf, 1, st.st_size, file);
 							fclose(file);
 	struct stat st;
 	if (iconfile == NULL) {
 		aim_ssi_delicon(od->sess);
 	} else if (!g_stat(iconfile, &st)) {
-		char *buf = g_malloc(st.st_size);
+		guchar *buf = g_malloc(st.st_size);
 		file = g_fopen(iconfile, "rb");
 		if (file) {
 			md5_state_t *state;
-			char md5[16];
+			guchar md5[16];
 			/* XXX - Use g_file_get_contents()? */
 			int len = fread(buf, 1, st.st_size, file);
 			fclose(file);
 			state = g_malloc(sizeof(md5_state_t));
 			md5_init(state);

Mercurial > pidgin.yaz

comparison src/protocols/oscar/oscar.c @ 11159:bd8ac1d4b2f2