Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/family_locate.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 | 2f99cf09d912 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_locate.c Tue May 29 05:40:45 2007 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Tue May 29 09:51:51 2007 +0000 @@ -930,7 +930,7 @@ int aim_putuserinfo(ByteStream *bs, aim_userinfo_t *info) { - aim_tlvlist_t *tlvlist = NULL; + GSList *tlvlist = NULL; if (!bs || !info) return -EINVAL; @@ -965,9 +965,9 @@ if (info->present & AIM_USERINFO_PRESENT_SESSIONLEN) aim_tlvlist_add_32(&tlvlist, (guint16)((info->flags & AIM_FLAG_AOL) ? 0x0010 : 0x000f), info->sessionlen); - byte_stream_put16(bs, aim_tlvlist_count(&tlvlist)); + byte_stream_put16(bs, aim_tlvlist_count(tlvlist)); aim_tlvlist_write(bs, &tlvlist); - aim_tlvlist_free(&tlvlist); + aim_tlvlist_free(tlvlist); return 0; } @@ -1050,7 +1050,7 @@ static int rights(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs) { - aim_tlvlist_t *tlvlist; + GSList *tlvlist; aim_rxcallback_t userfunc; int ret = 0; guint16 maxsiglen = 0; @@ -1063,7 +1063,7 @@ if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) ret = userfunc(od, conn, frame, maxsiglen); - aim_tlvlist_free(&tlvlist); + aim_tlvlist_free(tlvlist); return ret; } @@ -1096,7 +1096,7 @@ FlapConnection *conn; FlapFrame *frame; aim_snacid_t snacid; - aim_tlvlist_t *tl = NULL; + GSList *tlvlist = NULL; char *encoding; static const char defencoding[] = {"text/aolrtf; charset=\"%s\""}; @@ -1115,8 +1115,8 @@ /* no + 1 here because of %s */ encoding = g_malloc(strlen(defencoding) + strlen(profile_encoding)); snprintf(encoding, strlen(defencoding) + strlen(profile_encoding), defencoding, profile_encoding); - aim_tlvlist_add_str(&tl, 0x0001, encoding); - aim_tlvlist_add_raw(&tl, 0x0002, profile_len, (const guchar *)profile); + aim_tlvlist_add_str(&tlvlist, 0x0001, encoding); + aim_tlvlist_add_raw(&tlvlist, 0x0002, profile_len, (const guchar *)profile); g_free(encoding); } @@ -1132,20 +1132,20 @@ if (awaymsg_len) { encoding = g_malloc(strlen(defencoding) + strlen(awaymsg_encoding)); snprintf(encoding, strlen(defencoding) + strlen(awaymsg_encoding), defencoding, awaymsg_encoding); - aim_tlvlist_add_str(&tl, 0x0003, encoding); - aim_tlvlist_add_raw(&tl, 0x0004, awaymsg_len, (const guchar *)awaymsg); + aim_tlvlist_add_str(&tlvlist, 0x0003, encoding); + aim_tlvlist_add_raw(&tlvlist, 0x0004, awaymsg_len, (const guchar *)awaymsg); g_free(encoding); } else - aim_tlvlist_add_noval(&tl, 0x0004); + aim_tlvlist_add_noval(&tlvlist, 0x0004); } - frame = flap_frame_new(od, 0x02, 10 + aim_tlvlist_size(&tl)); + frame = flap_frame_new(od, 0x02, 10 + aim_tlvlist_size(tlvlist)); snacid = aim_cachesnac(od, 0x0002, 0x0004, 0x0000, NULL, 0); aim_putsnac(&frame->data, 0x0002, 0x004, 0x0000, snacid); - aim_tlvlist_write(&frame->data, &tl); - aim_tlvlist_free(&tl); + aim_tlvlist_write(&frame->data, &tlvlist); + aim_tlvlist_free(tlvlist); flap_connection_send(conn, frame); @@ -1161,20 +1161,20 @@ FlapConnection *conn; FlapFrame *frame; aim_snacid_t snacid; - aim_tlvlist_t *tl = NULL; + GSList *tlvlist = NULL; if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE))) return -EINVAL; - aim_tlvlist_add_caps(&tl, 0x0005, caps); + aim_tlvlist_add_caps(&tlvlist, 0x0005, caps); - frame = flap_frame_new(od, 0x02, 10 + aim_tlvlist_size(&tl)); + frame = flap_frame_new(od, 0x02, 10 + aim_tlvlist_size(tlvlist)); snacid = aim_cachesnac(od, 0x0002, 0x0004, 0x0000, NULL, 0); aim_putsnac(&frame->data, 0x0002, 0x004, 0x0000, snacid); - aim_tlvlist_write(&frame->data, &tl); - aim_tlvlist_free(&tl); + aim_tlvlist_write(&frame->data, &tlvlist); + aim_tlvlist_free(tlvlist); flap_connection_send(conn, frame); @@ -1221,7 +1221,7 @@ int ret = 0; aim_rxcallback_t userfunc; aim_userinfo_t *userinfo, *userinfo2; - aim_tlvlist_t *tlvlist; + GSList *tlvlist; aim_tlv_t *tlv = NULL; int was_explicit; @@ -1252,7 +1252,7 @@ userinfo->capabilities = aim_locate_getcaps(od, &cbs, tlv->length); userinfo->present = AIM_USERINFO_PRESENT_CAPABILITIES; } - aim_tlvlist_free(&tlvlist); + aim_tlvlist_free(tlvlist); aim_locate_adduserinfo(od, userinfo); userinfo2 = aim_locate_finduserinfo(od, userinfo->sn); @@ -1284,42 +1284,42 @@ FlapConnection *conn; FlapFrame *frame; aim_snacid_t snacid; - aim_tlvlist_t *tl = NULL; + GSList *tlvlist = NULL; if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE))) return -EINVAL; - aim_tlvlist_add_16(&tl, 0x000a, privacy); + aim_tlvlist_add_16(&tlvlist, 0x000a, privacy); if (first) - aim_tlvlist_add_str(&tl, 0x0001, first); + aim_tlvlist_add_str(&tlvlist, 0x0001, first); if (last) - aim_tlvlist_add_str(&tl, 0x0002, last); + aim_tlvlist_add_str(&tlvlist, 0x0002, last); if (middle) - aim_tlvlist_add_str(&tl, 0x0003, middle); + aim_tlvlist_add_str(&tlvlist, 0x0003, middle); if (maiden) - aim_tlvlist_add_str(&tl, 0x0004, maiden); + aim_tlvlist_add_str(&tlvlist, 0x0004, maiden); if (state) - aim_tlvlist_add_str(&tl, 0x0007, state); + aim_tlvlist_add_str(&tlvlist, 0x0007, state); if (city) - aim_tlvlist_add_str(&tl, 0x0008, city); + aim_tlvlist_add_str(&tlvlist, 0x0008, city); if (nickname) - aim_tlvlist_add_str(&tl, 0x000c, nickname); + aim_tlvlist_add_str(&tlvlist, 0x000c, nickname); if (zip) - aim_tlvlist_add_str(&tl, 0x000d, zip); + aim_tlvlist_add_str(&tlvlist, 0x000d, zip); if (street) - aim_tlvlist_add_str(&tl, 0x0021, street); + aim_tlvlist_add_str(&tlvlist, 0x0021, street); - frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(&tl)); + frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(tlvlist)); snacid = aim_cachesnac(od, 0x0002, 0x0009, 0x0000, NULL, 0); aim_putsnac(&frame->data, 0x0002, 0x0009, 0x0000, snacid); - aim_tlvlist_write(&frame->data, &tl); - aim_tlvlist_free(&tl); + aim_tlvlist_write(&frame->data, &tlvlist); + aim_tlvlist_free(tlvlist); flap_connection_send(conn, frame); @@ -1365,32 +1365,32 @@ FlapConnection *conn; FlapFrame *frame; aim_snacid_t snacid; - aim_tlvlist_t *tl = NULL; + GSList *tlvlist = NULL; if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE))) return -EINVAL; /* ?? privacy ?? */ - aim_tlvlist_add_16(&tl, 0x000a, privacy); + aim_tlvlist_add_16(&tlvlist, 0x000a, privacy); if (interest1) - aim_tlvlist_add_str(&tl, 0x0000b, interest1); + aim_tlvlist_add_str(&tlvlist, 0x0000b, interest1); if (interest2) - aim_tlvlist_add_str(&tl, 0x0000b, interest2); + aim_tlvlist_add_str(&tlvlist, 0x0000b, interest2); if (interest3) - aim_tlvlist_add_str(&tl, 0x0000b, interest3); + aim_tlvlist_add_str(&tlvlist, 0x0000b, interest3); if (interest4) - aim_tlvlist_add_str(&tl, 0x0000b, interest4); + aim_tlvlist_add_str(&tlvlist, 0x0000b, interest4); if (interest5) - aim_tlvlist_add_str(&tl, 0x0000b, interest5); + aim_tlvlist_add_str(&tlvlist, 0x0000b, interest5); - frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(&tl)); + frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(tlvlist)); snacid = aim_cachesnac(od, 0x0002, 0x000f, 0x0000, NULL, 0); aim_putsnac(&frame->data, 0x0002, 0x000f, 0x0000, 0); - aim_tlvlist_write(&frame->data, &tl); - aim_tlvlist_free(&tl); + aim_tlvlist_write(&frame->data, &tlvlist); + aim_tlvlist_free(tlvlist); flap_connection_send(conn, frame);