comparison libpurple/protocols/oscar/family_icq.c @ 17445:f80f7e1047be

Cleanup and simplification of some tlvlist stuff in the oscar protocol. No functionality change.
author Mark Doliner <mark@kingant.net>
date Tue, 29 May 2007 09:51:51 +0000
parents 1927f4ead3ca
children eb0933e158a4
comparison
equal deleted inserted replaced
17444:b31f53796f3b 17445:f80f7e1047be
472 */ 472 */
473 static int 473 static int
474 icqresponse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs) 474 icqresponse(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
475 { 475 {
476 int ret = 0; 476 int ret = 0;
477 aim_tlvlist_t *tl; 477 GSList *tlvlist;
478 aim_tlv_t *datatlv; 478 aim_tlv_t *datatlv;
479 ByteStream qbs; 479 ByteStream qbs;
480 guint32 ouruin; 480 guint32 ouruin;
481 guint16 cmdlen, cmd, reqid; 481 guint16 cmdlen, cmd, reqid;
482 482
483 if (!(tl = aim_tlvlist_read(bs)) || !(datatlv = aim_tlv_gettlv(tl, 0x0001, 1))) { 483 if (!(tlvlist = aim_tlvlist_read(bs)) || !(datatlv = aim_tlv_gettlv(tlvlist, 0x0001, 1))) {
484 aim_tlvlist_free(&tl); 484 aim_tlvlist_free(tlvlist);
485 purple_debug_misc("oscar", "corrupt ICQ response\n"); 485 purple_debug_misc("oscar", "corrupt ICQ response\n");
486 return 0; 486 return 0;
487 } 487 }
488 488
489 byte_stream_init(&qbs, datatlv->value, datatlv->length); 489 byte_stream_init(&qbs, datatlv->value, datatlv->length);
659 } 659 }
660 aim_icq_freeinfo(info); 660 aim_icq_freeinfo(info);
661 } 661 }
662 } 662 }
663 663
664 aim_tlvlist_free(&tl); 664 aim_tlvlist_free(tlvlist);
665 665
666 return ret; 666 return ret;
667 } 667 }
668 668
669 static int 669 static int