[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37606 - gnunet/src/psycstore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37606 - gnunet/src/psycstore |
Date: |
Fri, 29 Jul 2016 11:41:53 +0200 |
Author: christophe.genevey
Date: 2016-07-29 11:41:53 +0200 (Fri, 29 Jul 2016)
New Revision: 37606
Modified:
gnunet/src/psycstore/plugin_psycstore_mysql.c
Log:
fix fragment_row function
Modified: gnunet/src/psycstore/plugin_psycstore_mysql.c
===================================================================
--- gnunet/src/psycstore/plugin_psycstore_mysql.c 2016-07-29 08:11:28 UTC
(rev 37605)
+++ gnunet/src/psycstore/plugin_psycstore_mysql.c 2016-07-29 09:41:53 UTC
(rev 37606)
@@ -1026,6 +1026,7 @@
struct GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags;
+ int sql_ret;
int ret = GNUNET_SYSERR;
struct GNUNET_MY_QueryParam params_update[] = {
@@ -1035,13 +1036,17 @@
GNUNET_MY_query_param_end
};
- if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc,
+ sql_ret = GNUNET_MY_exec_prepared (plugin->mc,
stmt,
- params_update))
+ params_update);
+ switch(sql_ret)
{
- LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ case GNUNET_OK:
+ ret = GNUNET_OK;
+ break;
+ default:
+ LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"mysql execute prepared", stmt);
- return GNUNET_SYSERR;
}
if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
@@ -1151,16 +1156,18 @@
int ret = GNUNET_SYSERR;
int sql_ret;
- struct GNUNET_MULTICAST_MessageHeader *msg
- = GNUNET_malloc (sizeof (*msg) + 0);
-
sql_ret = GNUNET_MY_exec_prepared (plugin->mc,
stmt,
params);
switch(sql_ret)
{
+ case GNUNET_NO:
+ if (ret != GNUNET_OK)
+ ret = GNUNET_NO;
+ break;
case GNUNET_YES:
ret = fragment_row (stmt, cb, cb_cls);
+ (*returned_fragments)++;
break;
default:
LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
@@ -1187,9 +1194,7 @@
void *cb_cls)
{
struct Plugin *plugin = cls;
-
struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_fragments;
-
int ret = GNUNET_SYSERR;
*returned_fragments = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37606 - gnunet/src/psycstore,
gnunet <=