[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 14/19: fix logic
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 14/19: fix logic |
Date: |
Mon, 04 Jun 2018 19:19:05 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 54031a5360d3ea2d7bb99304bfc5abc36807d33a
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jun 3 16:30:40 2018 +0200
fix logic
---
src/datacache/plugin_datacache_sqlite.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/datacache/plugin_datacache_sqlite.c
b/src/datacache/plugin_datacache_sqlite.c
index c4adb34fd..ef24199ca 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))
{
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (2b99bddcb -> b670eec1c), gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 02/19: build xt, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 03/19: disable LAN/loopback for AC, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 06/19: skip validation logic, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 04/19: Merge branch 'h2020' of git+ssh://gnunet.org/gnunet into h2020, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 05/19: track hello passing, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 12/19: more logging, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 09/19: disable xu transport, header missing, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 14/19: fix logic,
gnunet <=
- [GNUnet-SVN] [gnunet] 07/19: skip validation logic, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 16/19: more crypto KX logging, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 17/19: more logging, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 15/19: more core KX logging, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 11/19: add more logging for core KX to improve diagnostics, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 19/19: merge benchmark changes, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 18/19: add function for getopt uint16_t arguments, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 13/19: proper datacache expiration by proximity first, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 10/19: add proximity considerations to datacache, gnunet, 2018/06/04
- [GNUnet-SVN] [gnunet] 08/19: adding xu transport, gnunet, 2018/06/04