comparison libpurple/protocols/oscar/tlv.c @ 22718:da3de0190be2

Used byte_stream_destroy(), added in 2e791da1fb1cfd6b751a0cef01aa83dc89692051, rather than a direct call to g_free(), in the remaining places it was found for ByteStreams.
author Evan Schoenberg <evan.s@dreskin.net>
date Thu, 24 Apr 2008 11:19:26 +0000
parents 44b4e8bd759b
children 365b90fa23cf
comparison
equal deleted inserted replaced
22717:979a81468e19 22718:da3de0190be2
229 229
230 aim_tlvlist_write(&bs1, &one); 230 aim_tlvlist_write(&bs1, &one);
231 aim_tlvlist_write(&bs2, &two); 231 aim_tlvlist_write(&bs2, &two);
232 232
233 if (memcmp(bs1.data, bs2.data, bs1.len)) { 233 if (memcmp(bs1.data, bs2.data, bs1.len)) {
234 g_free(bs1.data); 234 byte_stream_destroy(&bs1);
235 g_free(bs2.data); 235 byte_stream_destroy(&bs2);
236 return 1; 236 return 1;
237 } 237 }
238 238
239 g_free(bs1.data); 239 byte_stream_destroy(&bs1);
240 g_free(bs2.data); 240 byte_stream_destroy(&bs2);
241 241
242 return 0; 242 return 0;
243 } 243 }
244 244
245 /** 245 /**
443 byte_stream_putstr(&bs, roomname); 443 byte_stream_putstr(&bs, roomname);
444 byte_stream_put16(&bs, instance); 444 byte_stream_put16(&bs, instance);
445 445
446 len = aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data); 446 len = aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data);
447 447
448 g_free(bs.data); 448 byte_stream_destroy(&bs);
449 449
450 return len; 450 return len;
451 } 451 }
452 452
453 /** 453 /**
492 492
493 aim_tlvlist_write(&bs, tlvlist); 493 aim_tlvlist_write(&bs, tlvlist);
494 494
495 aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data); 495 aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data);
496 496
497 g_free(bs.data); 497 byte_stream_destroy(&bs);
498 498
499 return buflen; 499 return buflen;
500 } 500 }
501 501
502 /** 502 /**