diff src/protocols/oscar/search.c @ 7167:6d3d8f11e765

[gaim-migrate @ 7734] I, uh, renamed some functions in libfaim. Functions that every file uses. A lot. So it looks like I did a lot of work, but I didn't. Yeah, in a typical work I actually only do about 15 minutes of real work. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 05 Oct 2003 23:50:40 +0000
parents e6b01bd8d6cd
children 8d74ae785a46
line wrap: on
line diff
--- a/src/protocols/oscar/search.c	Sun Oct 05 22:41:29 2003 +0000
+++ b/src/protocols/oscar/search.c	Sun Oct 05 23:50:40 2003 +0000
@@ -77,14 +77,14 @@
 	if ((snac2 = aim_remsnac(sess, snac->id)))
 		searchaddr = (char *)snac2->data;
 
-	tlvlist = aim_readtlvchain(bs);
-	m = aim_counttlvchain(&tlvlist);
+	tlvlist = aim_tlvlist_read(bs);
+	m = aim_tlvlist_count(&tlvlist);
 
 	/* XXX uhm.
 	 * This is the only place that uses something other than 1 for the 3rd 
-	 * parameter to aim_gettlv_whatever().
+	 * parameter to aim_tlv_gettlv_whatever().
 	 */
-	while ((cur = aim_gettlv_str(tlvlist, 0x0001, j+1)) && j < m) {
+	while ((cur = aim_tlv_getstr(tlvlist, 0x0001, j+1)) && j < m) {
 		buf = realloc(buf, (j+1) * (MAXSNLEN+1));
 
 		strncpy(&buf[j * (MAXSNLEN+1)], cur, MAXSNLEN);
@@ -93,7 +93,7 @@
 		j++; 
 	}
 
-	aim_freetlvchain(&tlvlist);
+	aim_tlvlist_free(&tlvlist);
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
 		ret = userfunc(sess, rx, searchaddr, j, buf);