comparison libpurple/protocols/oscar/family_icbm.c @ 27590:a08e84032814

merge of '2348ff22f0ff3453774b8b25b36238465580c609' and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Jul 2009 05:43:38 +0000
parents a2508ac2e536
children 074e67a105be
comparison
equal deleted inserted replaced
27104:048bcf41deef 27590:a08e84032814
1564 return 0; 1564 return 0;
1565 } 1565 }
1566 1566
1567 static int incomingim_ch1(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, guint16 channel, aim_userinfo_t *userinfo, ByteStream *bs, guint8 *cookie) 1567 static int incomingim_ch1(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, guint16 channel, aim_userinfo_t *userinfo, ByteStream *bs, guint8 *cookie)
1568 { 1568 {
1569 guint16 type, length, magic1, msglen; 1569 guint16 type, length, magic1, msglen = 0;
1570 aim_rxcallback_t userfunc; 1570 aim_rxcallback_t userfunc;
1571 int ret = 0; 1571 int ret = 0;
1572 int rev = 0; 1572 int rev = 0;
1573 struct aim_incomingim_ch1_args args; 1573 struct aim_incomingim_ch1_args args;
1574 unsigned int endpos; 1574 unsigned int endpos;