diff options
Diffstat (limited to 'src/psycstore/plugin_psycstore_mysql.c')
-rw-r--r-- | src/psycstore/plugin_psycstore_mysql.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c index 209d50a3d..94179872f 100644 --- a/src/psycstore/plugin_psycstore_mysql.c +++ b/src/psycstore/plugin_psycstore_mysql.c | |||
@@ -1023,7 +1023,6 @@ message_add_flags (void *cls, | |||
1023 | uint64_t psycstore_flags) | 1023 | uint64_t psycstore_flags) |
1024 | { | 1024 | { |
1025 | struct Plugin *plugin = cls; | 1025 | struct Plugin *plugin = cls; |
1026 | |||
1027 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags; | 1026 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags; |
1028 | 1027 | ||
1029 | int sql_ret; | 1028 | int sql_ret; |
@@ -1157,8 +1156,8 @@ fragment_select (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stm | |||
1157 | int sql_ret; | 1156 | int sql_ret; |
1158 | 1157 | ||
1159 | sql_ret = GNUNET_MY_exec_prepared (plugin->mc, | 1158 | sql_ret = GNUNET_MY_exec_prepared (plugin->mc, |
1160 | stmt, | 1159 | stmt, |
1161 | params); | 1160 | params); |
1162 | switch(sql_ret) | 1161 | switch(sql_ret) |
1163 | { | 1162 | { |
1164 | case GNUNET_NO: | 1163 | case GNUNET_NO: |
@@ -1173,7 +1172,7 @@ fragment_select (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stm | |||
1173 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1172 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1174 | "mysql exec_prepared", stmt); | 1173 | "mysql exec_prepared", stmt); |
1175 | } | 1174 | } |
1176 | 1175 | ||
1177 | return ret; | 1176 | return ret; |
1178 | } | 1177 | } |
1179 | 1178 | ||
@@ -1363,9 +1362,8 @@ message_get_fragment (void *cls, | |||
1363 | void *cb_cls) | 1362 | void *cb_cls) |
1364 | { | 1363 | { |
1365 | struct Plugin *plugin = cls; | 1364 | struct Plugin *plugin = cls; |
1366 | |||
1367 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_message_fragment; | 1365 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_message_fragment; |
1368 | 1366 | int sql_ret; | |
1369 | int ret = GNUNET_SYSERR; | 1367 | int ret = GNUNET_SYSERR; |
1370 | 1368 | ||
1371 | struct GNUNET_MY_QueryParam params_select[] = { | 1369 | struct GNUNET_MY_QueryParam params_select[] = { |
@@ -1375,17 +1373,22 @@ message_get_fragment (void *cls, | |||
1375 | GNUNET_MY_query_param_end | 1373 | GNUNET_MY_query_param_end |
1376 | }; | 1374 | }; |
1377 | 1375 | ||
1378 | if (GNUNET_OK != GNUNET_MY_exec_prepared (plugin->mc, | 1376 | sql_ret = GNUNET_MY_exec_prepared (plugin->mc, |
1379 | stmt, | 1377 | stmt, |
1380 | params_select)) | 1378 | params_select); |
1379 | switch(sql_ret) | ||
1381 | { | 1380 | { |
1382 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1381 | case GNUNET_NO: |
1382 | ret = GNUNET_NO; | ||
1383 | break; | ||
1384 | case GNUNET_OK: | ||
1385 | ret = fragment_row (stmt, cb, cb_cls); | ||
1386 | break; | ||
1387 | default: | ||
1388 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1383 | "mysql execute prepared", stmt); | 1389 | "mysql execute prepared", stmt); |
1384 | return GNUNET_SYSERR; | ||
1385 | } | 1390 | } |
1386 | 1391 | ||
1387 | ret = fragment_row (stmt, cb, cb_cls); | ||
1388 | |||
1389 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) | 1392 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1390 | { | 1393 | { |
1391 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1394 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |