debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Optimize array iterations in main.c

Browse source
This commit is contained in:
Christian Dywan 2009-03-31 03:24:29 +02:00
parent 31bf9962fa
commit 7cddd8ade3
1 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
midori/main.c
View file

@ -287,7 +287,7 @@ search_engines_save_to_file (KatzeArray* search_engines,
GError** error) GError** error)
{ {
GKeyFile* key_file; GKeyFile* key_file;
guint n, i, j, n_properties; guint i, j, n_properties;
KatzeItem* item; KatzeItem* item;
const gchar* name; const gchar* name;
GParamSpec** pspecs; GParamSpec** pspecs;
@ -296,12 +296,11 @@ search_engines_save_to_file (KatzeArray* search_engines,
gboolean saved; gboolean saved;
key_file = g_key_file_new (); key_file = g_key_file_new ();
n = katze_array_get_length (search_engines);
pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines), pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (search_engines),
&n_properties); &n_properties);
for (i = 0; i < n; i++) i = 0;
while ((item = katze_array_get_nth_item (search_engines, i++)))
{ {
item = katze_array_get_nth_item (search_engines, i);
name = katze_item_get_name (item); name = katze_item_get_name (item);
for (j = 0; j < n_properties; j++) for (j = 0; j < n_properties; j++)
{ {
@ -800,7 +799,7 @@ midori_history_initialize (KatzeArray* array,
{ {
sqlite3* db; sqlite3* db;
KatzeItem* item; KatzeItem* item;
gint i, n; gint i;
gboolean has_day; gboolean has_day;
has_day = FALSE; has_day = FALSE;
@ -846,10 +845,9 @@ midori_history_initialize (KatzeArray* array,
error)) error))
return NULL; return NULL;
n = katze_array_get_length (array); i = 0;
for (i = 0; i < n; i++) while ((item = katze_array_get_nth_item (array, i++)))
{ {
item = katze_array_get_nth_item (array, i);
g_signal_connect_after (item, "add-item", g_signal_connect_after (item, "add-item",
G_CALLBACK (midori_history_add_item_cb), db); G_CALLBACK (midori_history_add_item_cb), db);
g_signal_connect (item, "remove-item", g_signal_connect (item, "remove-item",
@ -966,11 +964,10 @@ katze_item_to_data (KatzeItem* item)
if (KATZE_IS_ARRAY (item)) if (KATZE_IS_ARRAY (item))
{ {
GString* _markup = g_string_new (NULL); GString* _markup = g_string_new (NULL);
guint n = katze_array_get_length (KATZE_ARRAY (item)); guint i = 0;
guint i; KatzeItem* _item;
for (i = 0; i < n; i++) while ((_item = katze_array_get_nth_item (KATZE_ARRAY (item), i++)))
{ {
KatzeItem* _item = katze_array_get_nth_item (KATZE_ARRAY (item), i);
gchar* item_markup = katze_item_to_data (_item); gchar* item_markup = katze_item_to_data (_item);
g_string_append (_markup, item_markup); g_string_append (_markup, item_markup);
g_free (item_markup); g_free (item_markup);
@ -1011,7 +1008,7 @@ katze_array_to_xml (KatzeArray* array,
GError** error) GError** error)
{ {
GString* inner_markup; GString* inner_markup;
guint i, n; guint i;
KatzeItem* item; KatzeItem* item;
gchar* item_xml; gchar* item_xml;
gchar* title; gchar* title;
@ -1021,10 +1018,9 @@ katze_array_to_xml (KatzeArray* array,
g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), NULL); g_return_val_if_fail (katze_array_is_a (array, KATZE_TYPE_ITEM), NULL);
inner_markup = g_string_new (NULL); inner_markup = g_string_new (NULL);
n = katze_array_get_length (array); i = 0;
for (i = 0; i < n; i++) while ((item = katze_array_get_nth_item (array, i++)))
{ {
item = katze_array_get_nth_item (array, i);
item_xml = katze_item_to_data (item); item_xml = katze_item_to_data (item);
g_string_append (inner_markup, item_xml); g_string_append (inner_markup, item_xml);
g_free (item_xml); g_free (item_xml);
@ -1155,7 +1151,6 @@ midori_trash_add_item_cb (KatzeArray* trash,
{ {
gchar* config_file; gchar* config_file;
GError* error; GError* error;
guint n;
GObject* obsolete_item; GObject* obsolete_item;
config_file = build_config_filename ("tabtrash.xbel"); config_file = build_config_filename ("tabtrash.xbel");
@ -1168,8 +1163,7 @@ midori_trash_add_item_cb (KatzeArray* trash,
} }
g_free (config_file); g_free (config_file);
n = katze_array_get_length (trash); if (katze_array_get_nth_item (trash, 10))
if (n > 10)
{ {
obsolete_item = katze_array_get_nth_item (trash, 0); obsolete_item = katze_array_get_nth_item (trash, 0);
katze_array_remove_item (trash, obsolete_item); katze_array_remove_item (trash, obsolete_item);
@ -1471,7 +1465,7 @@ midori_load_extensions (gpointer data)
KatzeArray* extensions; KatzeArray* extensions;
const gchar* filename; const gchar* filename;
MidoriExtension* extension; MidoriExtension* extension;
guint n, i; guint i;
/* Load extensions */ /* Load extensions */
extensions = katze_array_new (MIDORI_TYPE_EXTENSION); extensions = katze_array_new (MIDORI_TYPE_EXTENSION);
@ -1527,12 +1521,9 @@ midori_load_extensions (gpointer data)
g_object_set (app, "extensions", extensions, NULL); g_object_set (app, "extensions", extensions, NULL);
n = katze_array_get_length (extensions); i = 0;
for (i = 0; i < n; i++) while ((extension = katze_array_get_nth_item (extensions, i++)))
{
extension = katze_array_get_nth_item (extensions, i);
g_signal_emit_by_name (extension, "activate", app); g_signal_emit_by_name (extension, "activate", app);
}
return FALSE; return FALSE;
} }
@ -1546,7 +1537,7 @@ midori_load_session (gpointer data)
gchar* config_file; gchar* config_file;
KatzeArray* session; KatzeArray* session;
KatzeItem* item; KatzeItem* item;
guint n, i; guint i;
browser = midori_app_create_browser (app); browser = midori_app_create_browser (app);
midori_app_add_browser (app, browser); midori_app_add_browser (app, browser);
@ -1577,12 +1568,9 @@ midori_load_session (gpointer data)
} }
session = midori_browser_get_proxy_array (browser); session = midori_browser_get_proxy_array (browser);
n = katze_array_get_length (_session); i = 0;
for (i = 0; i < n; i++) while ((item = katze_array_get_nth_item (_session, i++)))
{
item = katze_array_get_nth_item (_session, i);
midori_browser_add_item (browser, item); midori_browser_add_item (browser, item);
}
/* FIXME: Switch to the last active page */ /* FIXME: Switch to the last active page */
item = katze_array_get_nth_item (_session, 0); item = katze_array_get_nth_item (_session, 0);
if (!strcmp (katze_item_get_uri (item), "")) if (!strcmp (katze_item_get_uri (item), ""))
@ -1931,15 +1919,12 @@ main (int argc,
G_CALLBACK (midori_search_engines_modify_cb), search_engines); G_CALLBACK (midori_search_engines_modify_cb), search_engines);
if (!katze_array_is_empty (search_engines)) if (!katze_array_is_empty (search_engines))
{ {
guint n = katze_array_get_length (search_engines); i = 0;
for (i = 0; i < n; i++) while ((item = katze_array_get_nth_item (search_engines, i++)))
{
item = katze_array_get_nth_item (search_engines, i);
g_signal_connect_after (item, "notify", g_signal_connect_after (item, "notify",
G_CALLBACK (midori_search_engines_modify_cb), search_engines); G_CALLBACK (midori_search_engines_modify_cb), search_engines);
} }
} }
}
katze_assign (config_file, build_config_filename ("bookmarks.xbel")); katze_assign (config_file, build_config_filename ("bookmarks.xbel"));
if (is_writable (config_file)) if (is_writable (config_file))
{ {
@ -1949,10 +1934,9 @@ main (int argc,
G_CALLBACK (midori_bookmarks_remove_item_cb), NULL); G_CALLBACK (midori_bookmarks_remove_item_cb), NULL);
if (!katze_array_is_empty (bookmarks)) if (!katze_array_is_empty (bookmarks))
{ {
guint n = katze_array_get_length (bookmarks); i = 0;
for (i = 0; i < n; i++) while ((item = katze_array_get_nth_item (bookmarks, i++)))
{ {
item = katze_array_get_nth_item (bookmarks, i);
if (KATZE_IS_ARRAY (item)) if (KATZE_IS_ARRAY (item))
{ {
g_signal_connect_after (item, "add-item", g_signal_connect_after (item, "add-item",