diff src/protocols/oscar/ft.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 <[e-mail]>

--- a/src/protocols/oscar/ft.c	Mon Jul 25 23:46:34 2005 +0000
+++ b/src/protocols/oscar/ft.c	Tue Jul 26 04:34:37 2005 +0000
@@ -394,7 +394,7 @@
 	aimbs_put16(hdrbs, 0x393e);
 	aimbs_put16(hdrbs, 0xcac8);
 #endif
-	aimbs_putraw(hdrbs, msg, len);
+	aimbs_putraw(hdrbs, (guchar *)msg, len);
 
 	aim_tx_enqueue(sess, fr);
 
@@ -429,7 +429,7 @@
  * @param conn The ODC connection.
  * @return The cookie, an 8 byte unterminated string, or NULL if there was an anomaly.
  */
-faim_export const char *aim_odc_getcookie(aim_conn_t *conn)
+faim_export const guchar *aim_odc_getcookie(aim_conn_t *conn)
 {
 	struct aim_odc_intdata *intdata;
 
@@ -789,7 +789,7 @@
 	fh->rfcsum = aimbs_get32(bs);
 	fh->nrecvd = aimbs_get32(bs);
 	fh->recvcsum = aimbs_get32(bs);
-	aimbs_getrawbuf(bs, fh->idstring, 32);
+	aimbs_getrawbuf(bs, (guchar *)fh->idstring, 32);
 	fh->flags = aimbs_get8(bs);
 	fh->lnameoffset = aimbs_get8(bs);
 	fh->lsizeoffset = aimbs_get8(bs);
@@ -797,7 +797,7 @@
 	aimbs_getrawbuf(bs, fh->macfileinfo, 16);
 	fh->nencode = aimbs_get16(bs);
 	fh->nlanguage = aimbs_get16(bs);
-	aimbs_getrawbuf(bs, fh->name, 64); /* XXX - filenames longer than 64B */
+	aimbs_getrawbuf(bs, (guchar *)fh->name, 64); /* XXX - filenames longer than 64B */
 	fh->name[63] = '\0';
 
 	return fh;
@@ -838,7 +838,7 @@
 	aimbs_put32(bs, fh->rfcsum);
 	aimbs_put32(bs, fh->nrecvd);
 	aimbs_put32(bs, fh->recvcsum);
-	aimbs_putraw(bs, fh->idstring, 32);
+	aimbs_putraw(bs, (const guchar *)fh->idstring, 32);
 	aimbs_put8(bs, fh->flags);
 	aimbs_put8(bs, fh->lnameoffset);
 	aimbs_put8(bs, fh->lsizeoffset);
@@ -846,7 +846,7 @@
 	aimbs_putraw(bs, fh->macfileinfo, 16);
 	aimbs_put16(bs, fh->nencode);
 	aimbs_put16(bs, fh->nlanguage);
-	aimbs_putraw(bs, fh->name, 64);	/* XXX - filenames longer than 64B */
+	aimbs_putraw(bs, (const guchar *)fh->name, 64); /* XXX - filenames longer than 64B */
 
 	return 0;
 }