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

Switch to prepared statements when adding/ updating history

Browse source
This commit is contained in:
Alexander Butenko 2010-02-04 19:13:16 +01:00 committed by Christian Dywan
parent c2e8282696
commit db334e2921
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
midori/midori-browser.c
View file

@ -465,22 +465,24 @@ midori_browser_update_history_title (MidoriBrowser* browser,
{ {
#if HAVE_SQLITE #if HAVE_SQLITE
sqlite3* db; sqlite3* db;
gchar* sqlcmd; static sqlite3_stmt* stmt = NULL;
char* errmsg = NULL;
db = g_object_get_data (G_OBJECT (browser->history), "db"); db = g_object_get_data (G_OBJECT (browser->history), "db");
sqlcmd = sqlite3_mprintf ("UPDATE history SET title='%q' WHERE" if (!stmt)
" uri = '%q' and date=%d",
katze_item_get_name (item),
katze_item_get_uri (item),
katze_item_get_added (item));
if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
{ {
g_printerr (_("Failed to insert new history item: %s\n"), errmsg); const gchar* sqlcmd;
sqlite3_free (errmsg);
sqlcmd = "UPDATE history SET title=? WHERE uri = ? and date=?";
sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
} }
sqlite3_free (sqlcmd); sqlite3_bind_text (stmt, 1, katze_item_get_name (item), -1, 0);
sqlite3_bind_text (stmt, 2, katze_item_get_uri (item), -1, 0);
sqlite3_bind_int64 (stmt, 3, katze_item_get_added (item));
if (sqlite3_step (stmt) != SQLITE_DONE)
g_printerr (_("Failed to update title: %s\n"), sqlite3_errmsg (db));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
#endif #endif
} }
@ -5597,8 +5599,7 @@ midori_browser_new_history_item (MidoriBrowser* browser,
gint64 day; gint64 day;
#if HAVE_SQLITE #if HAVE_SQLITE
sqlite3* db; sqlite3* db;
gchar* sqlcmd; static sqlite3_stmt* stmt = NULL;
char* errmsg = NULL;
#endif #endif
now = time (NULL); now = time (NULL);
@ -5607,19 +5608,23 @@ midori_browser_new_history_item (MidoriBrowser* browser,
#if HAVE_SQLITE #if HAVE_SQLITE
db = g_object_get_data (G_OBJECT (browser->history), "db"); db = g_object_get_data (G_OBJECT (browser->history), "db");
sqlcmd = sqlite3_mprintf ("INSERT INTO history (uri, title, date, day) VALUES " if (!stmt)
"('%q', '%q', %d, %d)",
katze_item_get_uri (*item),
katze_item_get_name (*item),
katze_item_get_added (*item),
day);
if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
{ {
g_printerr (_("Failed to insert new history item: %s\n"), errmsg); const gchar* sqlcmd;
sqlite3_free (errmsg);
sqlcmd = "INSERT INTO history (uri, title, date, day) VALUES (?,?,?,?)";
sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
} }
sqlite3_free (sqlcmd); sqlite3_bind_text (stmt, 1, katze_item_get_uri (*item), -1, 0);
sqlite3_bind_text (stmt, 2, katze_item_get_name (*item), -1, 0);
sqlite3_bind_int64 (stmt, 3, katze_item_get_added (*item));
sqlite3_bind_int64 (stmt, 4, day);
if (sqlite3_step (stmt) != SQLITE_DONE)
g_printerr (_("Failed to insert new history item: %s\n"),
sqlite3_errmsg (db));
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
#endif #endif
} }