comparison 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 <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 26 Jul 2005 04:34:37 +0000
parents 2a3568cbd8a6
children ccb38cf22483
comparison
equal deleted inserted replaced
11158:2c930d591492 11159:bd8ac1d4b2f2
392 aimbs_put16(hdrbs, 0x0001); 392 aimbs_put16(hdrbs, 0x0001);
393 aimbs_put16(hdrbs, 0x2e0f); 393 aimbs_put16(hdrbs, 0x2e0f);
394 aimbs_put16(hdrbs, 0x393e); 394 aimbs_put16(hdrbs, 0x393e);
395 aimbs_put16(hdrbs, 0xcac8); 395 aimbs_put16(hdrbs, 0xcac8);
396 #endif 396 #endif
397 aimbs_putraw(hdrbs, msg, len); 397 aimbs_putraw(hdrbs, (guchar *)msg, len);
398 398
399 aim_tx_enqueue(sess, fr); 399 aim_tx_enqueue(sess, fr);
400 400
401 return 0; 401 return 0;
402 } 402 }
427 * Get the cookie of a direct connection. 427 * Get the cookie of a direct connection.
428 * 428 *
429 * @param conn The ODC connection. 429 * @param conn The ODC connection.
430 * @return The cookie, an 8 byte unterminated string, or NULL if there was an anomaly. 430 * @return The cookie, an 8 byte unterminated string, or NULL if there was an anomaly.
431 */ 431 */
432 faim_export const char *aim_odc_getcookie(aim_conn_t *conn) 432 faim_export const guchar *aim_odc_getcookie(aim_conn_t *conn)
433 { 433 {
434 struct aim_odc_intdata *intdata; 434 struct aim_odc_intdata *intdata;
435 435
436 if (!conn || !conn->internal) 436 if (!conn || !conn->internal)
437 return NULL; 437 return NULL;
787 fh->rfsize = aimbs_get32(bs); 787 fh->rfsize = aimbs_get32(bs);
788 fh->cretime = aimbs_get32(bs); 788 fh->cretime = aimbs_get32(bs);
789 fh->rfcsum = aimbs_get32(bs); 789 fh->rfcsum = aimbs_get32(bs);
790 fh->nrecvd = aimbs_get32(bs); 790 fh->nrecvd = aimbs_get32(bs);
791 fh->recvcsum = aimbs_get32(bs); 791 fh->recvcsum = aimbs_get32(bs);
792 aimbs_getrawbuf(bs, fh->idstring, 32); 792 aimbs_getrawbuf(bs, (guchar *)fh->idstring, 32);
793 fh->flags = aimbs_get8(bs); 793 fh->flags = aimbs_get8(bs);
794 fh->lnameoffset = aimbs_get8(bs); 794 fh->lnameoffset = aimbs_get8(bs);
795 fh->lsizeoffset = aimbs_get8(bs); 795 fh->lsizeoffset = aimbs_get8(bs);
796 aimbs_getrawbuf(bs, fh->dummy, 69); 796 aimbs_getrawbuf(bs, fh->dummy, 69);
797 aimbs_getrawbuf(bs, fh->macfileinfo, 16); 797 aimbs_getrawbuf(bs, fh->macfileinfo, 16);
798 fh->nencode = aimbs_get16(bs); 798 fh->nencode = aimbs_get16(bs);
799 fh->nlanguage = aimbs_get16(bs); 799 fh->nlanguage = aimbs_get16(bs);
800 aimbs_getrawbuf(bs, fh->name, 64); /* XXX - filenames longer than 64B */ 800 aimbs_getrawbuf(bs, (guchar *)fh->name, 64); /* XXX - filenames longer than 64B */
801 fh->name[63] = '\0'; 801 fh->name[63] = '\0';
802 802
803 return fh; 803 return fh;
804 } 804 }
805 805
836 aimbs_put32(bs, fh->rfsize); 836 aimbs_put32(bs, fh->rfsize);
837 aimbs_put32(bs, fh->cretime); 837 aimbs_put32(bs, fh->cretime);
838 aimbs_put32(bs, fh->rfcsum); 838 aimbs_put32(bs, fh->rfcsum);
839 aimbs_put32(bs, fh->nrecvd); 839 aimbs_put32(bs, fh->nrecvd);
840 aimbs_put32(bs, fh->recvcsum); 840 aimbs_put32(bs, fh->recvcsum);
841 aimbs_putraw(bs, fh->idstring, 32); 841 aimbs_putraw(bs, (const guchar *)fh->idstring, 32);
842 aimbs_put8(bs, fh->flags); 842 aimbs_put8(bs, fh->flags);
843 aimbs_put8(bs, fh->lnameoffset); 843 aimbs_put8(bs, fh->lnameoffset);
844 aimbs_put8(bs, fh->lsizeoffset); 844 aimbs_put8(bs, fh->lsizeoffset);
845 aimbs_putraw(bs, fh->dummy, 69); 845 aimbs_putraw(bs, fh->dummy, 69);
846 aimbs_putraw(bs, fh->macfileinfo, 16); 846 aimbs_putraw(bs, fh->macfileinfo, 16);
847 aimbs_put16(bs, fh->nencode); 847 aimbs_put16(bs, fh->nencode);
848 aimbs_put16(bs, fh->nlanguage); 848 aimbs_put16(bs, fh->nlanguage);
849 aimbs_putraw(bs, fh->name, 64); /* XXX - filenames longer than 64B */ 849 aimbs_putraw(bs, (const guchar *)fh->name, 64); /* XXX - filenames longer than 64B */
850 850
851 return 0; 851 return 0;
852 } 852 }
853 853
854 /** 854 /**