aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/datacache/plugin_datacache_sqlite.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index c4adb34fdb..ef24199caa 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -426,23 +426,14 @@ sqlite_plugin_del (void *cls)
plugin->del_expired_stmt);
return GNUNET_SYSERR;
}
- if (SQLITE_ROW !=
- sqlite3_step (plugin->del_expired_stmt))
- {
- LOG_SQLITE (plugin->dbh,
- GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_step");
- GNUNET_SQ_reset (plugin->dbh,
- plugin->del_expired_stmt);
- return GNUNET_SYSERR;
- }
- if (GNUNET_OK !=
- GNUNET_SQ_extract_result (plugin->del_expired_stmt,
- rs))
+ if ( (SQLITE_ROW !=
+ sqlite3_step (plugin->del_expired_stmt)) ||
+ (GNUNET_OK !=
+ GNUNET_SQ_extract_result (plugin->del_expired_stmt,
+ rs)) )
{
GNUNET_SQ_reset (plugin->dbh,
plugin->del_expired_stmt);
-
if (SQLITE_ROW !=
sqlite3_step (plugin->del_select_stmt))
{