comparison src/gtkimhtml.c @ 12229:18f0dadb29cf

[gaim-migrate @ 14531] SF Patch #1366481 from Michael Carlson "The function gtk_smiley_tree_insert() in gtkimhtml.c is using up (on my system) the most CPU of all the functions in gaim whenever the preferences box is opened (tested by opening the preferences box 50 times and measuring with oprofile). The function is called some 297 times each time the prefs box is opened, and each time we call strlen() on a (usually 3 or 4) character string to see if the string is empty or not. I've eliminated the unnecessary call to strlen by checking the first element, and I've changed the while {} loop to a do {} while loop, because since we return if the string is empty at the beginning of the function, the same check on the first iteration of the loop is unnecessary. I believe it's faster for every case, even if only by a little bit." I don't know how necessary this is, but it doesn't hurt and it doesn't negatively impact the readability of the code. I also fixed an existing piece of code for which the compiler issued a warning. committer: Tailor Script <[e-mail]>

12228:f28e51bf9be8

			GtkIMHtmlSmiley *smiley)
{
	GtkSmileyTree *t = tree;
	const gchar *x = smiley->smile;

	if (!strlen (x))
		return;

	while (*x) {
		gchar *pos;
		gint index;

		if (!t->values)
			t->values = g_string_new ("");

			index = GPOINTER_TO_INT(pos) - GPOINTER_TO_INT(t->values->str);

		t = t->children [index];

		x++;
	}

	t->image = smiley;
}

{
	GSList *list = g_slist_prepend (NULL, tree);

	while (list) {
		GtkSmileyTree *t = list->data;
		gint i;
		list = g_slist_remove(list, t);
		if (t && t->values) {
			for (i = 0; i < t->values->len; i++)
				list = g_slist_prepend (list, t->children [i]);
			g_string_free (t->values, TRUE);

12229:18f0dadb29cf

			GtkIMHtmlSmiley *smiley)
{
	GtkSmileyTree *t = tree;
	const gchar *x = smiley->smile;

	if (!(*x))
		return;

	do {
		gchar *pos;
		gint index;

		if (!t->values)
			t->values = g_string_new ("");

			index = GPOINTER_TO_INT(pos) - GPOINTER_TO_INT(t->values->str);

		t = t->children [index];

		x++;
	} while (*x);

	t->image = smiley;
}

{
	GSList *list = g_slist_prepend (NULL, tree);

	while (list) {
		GtkSmileyTree *t = list->data;
		gsize i;
		list = g_slist_remove(list, t);
		if (t && t->values) {
			for (i = 0; i < t->values->len; i++)
				list = g_slist_prepend (list, t->children [i]);
			g_string_free (t->values, TRUE);