comparison libgaim/protocols/oscar/oscar.c @ 15243:859250fbf8a5

[gaim-migrate @ 18033] Hunted down a spare * in my garage and put it somewhere appropriate. committer: Tailor Script <tailor@pidgin.im>
author Evan Schoenberg <evan.s@dreskin.net>
date Wed, 20 Dec 2006 20:38:20 +0000
parents 1b5cd588c1ee
children c9b56198e8db
comparison
equal deleted inserted replaced
15242:3a13e7e2ed33 15243:859250fbf8a5
425 425
426 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE); 426 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE);
427 if (ret == NULL) 427 if (ret == NULL)
428 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE); 428 ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
429 if (ret == NULL) { 429 if (ret == NULL) {
430 char *str, *salvage, tmp; 430 char *str, *salvage, *tmp;
431 431
432 str = g_malloc(datalen + 1); 432 str = g_malloc(datalen + 1);
433 strncpy(str, data, datalen); 433 strncpy(str, data, datalen);
434 str[datalen] = '\0'; 434 str[datalen] = '\0';
435 salvage = gaim_utf8_salvage(str); 435 salvage = gaim_utf8_salvage(str);