changeset 11000:218cccfb8e48

[gaim-migrate @ 12849] Get rid of some more warnings. committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/aim.h	Thu Jun 09 05:17:56 2005 +0000
+++ b/src/protocols/oscar/aim.h	Fri Jun 10 04:08:21 2005 +0000
@@ -789,7 +789,7 @@
 	fu32_t icbmflags; /* some flags apply only to ->msg, not all mpmsg */
 
 	/* Only provided if message has a human-readable section */
-	char *msg;
+	fu8_t *msg;
 	int msglen;
 
 	/* Only provided if AIM_IMFLAGS_HASICON is set */
@@ -863,7 +863,7 @@
 	fu32_t uin; /* Of the sender of the ICBM */
 	fu8_t type;
 	fu8_t flags;
-	char *msg; /* Reason for auth request, deny, or accept */
+	fu8_t *msg; /* Reason for auth request, deny, or accept */
 	int msglen;
 };
 
@@ -880,9 +880,9 @@
 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_accept(aim_session_t *sess, struct aim_oft_info *info);
 /* 0x0006 */ faim_export int aim_im_sendch2_sendfile_cancel(aim_session_t *sess, struct aim_oft_info *oft_info);
 /* 0x0006 */ faim_export int aim_im_sendch2_geticqaway(aim_session_t *sess, const char *sn, int type);
-/* 0x0006 */ faim_export int aim_im_sendch4(aim_session_t *sess, char *sn, fu16_t type, fu8_t *message);
+/* 0x0006 */ faim_export int aim_im_sendch4(aim_session_t *sess, const char *sn, fu16_t type, const char *message);
 /* 0x0008 */ faim_export int aim_im_warn(aim_session_t *sess, aim_conn_t *conn, const char *destsn, fu32_t flags);
-/* 0x000b */ faim_export int aim_im_denytransfer(aim_session_t *sess, const char *sender, const char *cookie, fu16_t code);
+/* 0x000b */ faim_export int aim_im_denytransfer(aim_session_t *sess, const char *sender, const fu8_t *cookie, fu16_t code);
 /* 0x0014 */ faim_export int aim_im_sendmtn(aim_session_t *sess, fu16_t type1, const char *sn, fu16_t type2);
 
 
@@ -924,7 +924,7 @@
 };
 
 struct aim_oft_info {
-	char cookie[8];
+	fu8_t cookie[8];
 	char *sn;
 	char *proxyip;
 	char *clientip;

--- a/src/protocols/oscar/im.c	Thu Jun 09 05:17:56 2005 +0000
+++ b/src/protocols/oscar/im.c	Fri Jun 10 04:08:21 2005 +0000
@@ -340,7 +340,7 @@
 		aimbs_put16(&fr->data, args->charsubset);
 
 		/* Message.  Not terminated */
-		aimbs_putraw(&fr->data, args->msg, args->msglen);
+		aimbs_putstr(&fr->data, args->msg);
 	}
 
 	/* Set the Autoresponse flag */
@@ -658,12 +658,12 @@
 	aimbs_putle16(&fr->data, 0x0001);
 	aimbs_putle32(&fr->data, 0);
 	aimbs_putle16(&fr->data, strlen(args->rtfmsg)+1);
-	aimbs_putraw(&fr->data, args->rtfmsg, strlen(args->rtfmsg)+1);
+	aimbs_putraw(&fr->data, (fu8_t *)args->rtfmsg, strlen(args->rtfmsg)+1);
 
 	aimbs_putle32(&fr->data, args->fgcolor);
 	aimbs_putle32(&fr->data, args->bgcolor);
 	aimbs_putle32(&fr->data, strlen(rtfcap)+1);
-	aimbs_putraw(&fr->data, rtfcap, strlen(rtfcap)+1);
+	aimbs_putraw(&fr->data, (fu8_t *)rtfcap, strlen(rtfcap)+1);
 
 	aim_tx_enqueue(sess, fr);
 
@@ -1028,13 +1028,13 @@
  * @param message The message you want to send, it should be null terminated.
  * @return Return 0 if no errors, otherwise return the error number.
  */
-faim_export int aim_im_sendch4(aim_session_t *sess, char *sn, fu16_t type, fu8_t *message)
+faim_export int aim_im_sendch4(aim_session_t *sess, const char *sn, fu16_t type, const char *message)
 {
 	aim_conn_t *conn;
 	aim_frame_t *fr;
 	aim_snacid_t snacid;
 	int i;
-	char ck[8];
+	fu8_t ck[8];
 
 	if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0002)))
 		return -EINVAL;
@@ -1073,7 +1073,7 @@
 	 */
 	aimbs_putle16(&fr->data, type);
 	aimbs_putle16(&fr->data, strlen(message)+1);
-	aimbs_putraw(&fr->data, message, strlen(message)+1);
+	aimbs_putraw(&fr->data, (fu8_t *)message, strlen(message)+1);
 
 	/*
 	 * TLV t(0006) l(0000) v()
@@ -1143,7 +1143,7 @@
 		flag1 = aimbs_get16(&mbs);
 		flag2 = aimbs_get16(&mbs);
 
-		msg = aimbs_getstr(&mbs, msglen);
+		msg = aimbs_getraw(&mbs, msglen);
 	}
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
@@ -1249,7 +1249,7 @@
 {
 	fu8_t *dup;
 
-	if (!(dup = strdup(ascii)))
+	if (!(dup = (fu8_t *)strdup(ascii)))
 		return -1;
 
 	if (mpmsg_addsection(sess, mpm, 0x0000, 0x0000, dup, strlen(ascii)) == -1) {
@@ -1358,7 +1358,7 @@
 		 * the received messages are given in network byte order.
 		 *
 		 */
-		msgbuf = aimbs_getstr(&mbs, msglen);
+		msgbuf = aimbs_getraw(&mbs, msglen);
 		mpmsg_addsection(sess, &args->mpmsg, flag1, flag2, msgbuf, msglen);
 
 	} /* while */
@@ -2142,7 +2142,7 @@
  *    AIM_TRANSFER_DENY_NOTACCEPTING -- "client is not accepting transfers"
  * 
  */
-faim_export int aim_im_denytransfer(aim_session_t *sess, const char *sender, const char *cookie, fu16_t code)
+faim_export int aim_im_denytransfer(aim_session_t *sess, const char *sender, const fu8_t *cookie, fu16_t code)
 {
 	aim_conn_t *conn;
 	aim_frame_t *fr;