diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-12 02:55:29 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-12 02:55:29 +0100 |
commit | 7d473d08bcc4929c58b85ace2b16f781d721ad13 (patch) | |
tree | 881ef32cf913f747248f18acf5872975ff0a39bf /src/datastore | |
parent | a707b513688690a3dad9dc39535900da73a79f28 (diff) | |
download | gnunet-7d473d08bcc4929c58b85ace2b16f781d721ad13.tar.gz gnunet-7d473d08bcc4929c58b85ace2b16f781d721ad13.zip |
use new GNUNET_SQ_reset where applicable
Diffstat (limited to 'src/datastore')
-rw-r--r-- | src/datastore/plugin_datastore_sqlite.c | 64 |
1 files changed, 24 insertions, 40 deletions
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 54bf4e55d..491f73ed5 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c | |||
@@ -595,15 +595,12 @@ delete_by_rowid (struct Plugin *plugin, | |||
595 | { | 595 | { |
596 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 596 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
597 | "sqlite3_step"); | 597 | "sqlite3_step"); |
598 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) | 598 | GNUNET_SQ_reset (plugin->dbh, |
599 | LOG_SQLITE (plugin, | 599 | plugin->delRow); |
600 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
601 | "sqlite3_reset"); | ||
602 | return GNUNET_SYSERR; | 600 | return GNUNET_SYSERR; |
603 | } | 601 | } |
604 | if (SQLITE_OK != sqlite3_reset (plugin->delRow)) | 602 | GNUNET_SQ_reset (plugin->dbh, |
605 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 603 | plugin->delRow); |
606 | "sqlite3_reset"); | ||
607 | return GNUNET_OK; | 604 | return GNUNET_OK; |
608 | } | 605 | } |
609 | 606 | ||
@@ -702,19 +699,16 @@ sqlite_plugin_put (void *cls, | |||
702 | default: | 699 | default: |
703 | LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 700 | LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
704 | "sqlite3_step"); | 701 | "sqlite3_step"); |
705 | if (SQLITE_OK != sqlite3_reset (stmt)) | 702 | GNUNET_SQ_reset (plugin->dbh, |
706 | LOG_SQLITE (plugin, | 703 | stmt); |
707 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
708 | "sqlite3_reset"); | ||
709 | database_shutdown (plugin); | 704 | database_shutdown (plugin); |
710 | database_setup (plugin->env->cfg, plugin); | 705 | database_setup (plugin->env->cfg, plugin); |
711 | cont (cont_cls, key, size, GNUNET_SYSERR, msg); | 706 | cont (cont_cls, key, size, GNUNET_SYSERR, msg); |
712 | GNUNET_free_non_null(msg); | 707 | GNUNET_free_non_null(msg); |
713 | return; | 708 | return; |
714 | } | 709 | } |
715 | if (SQLITE_OK != sqlite3_reset (stmt)) | 710 | GNUNET_SQ_reset (plugin->dbh, |
716 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 711 | stmt); |
717 | "sqlite3_reset"); | ||
718 | cont (cont_cls, key, size, ret, msg); | 712 | cont (cont_cls, key, size, ret, msg); |
719 | GNUNET_free_non_null(msg); | 713 | GNUNET_free_non_null(msg); |
720 | } | 714 | } |
@@ -768,9 +762,8 @@ sqlite_plugin_update (void *cls, | |||
768 | return; | 762 | return; |
769 | } | 763 | } |
770 | n = sqlite3_step (plugin->updPrio); | 764 | n = sqlite3_step (plugin->updPrio); |
771 | if (SQLITE_OK != sqlite3_reset (plugin->updPrio)) | 765 | GNUNET_SQ_reset (plugin->dbh, |
772 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 766 | plugin->updPrio); |
773 | "sqlite3_reset"); | ||
774 | switch (n) | 767 | switch (n) |
775 | { | 768 | { |
776 | case SQLITE_DONE: | 769 | case SQLITE_DONE: |
@@ -887,11 +880,8 @@ execute_get (struct Plugin *plugin, | |||
887 | plugin); | 880 | plugin); |
888 | return; | 881 | return; |
889 | } | 882 | } |
890 | if (SQLITE_OK != | 883 | GNUNET_SQ_reset (plugin->dbh, |
891 | sqlite3_reset (stmt)) | 884 | stmt); |
892 | LOG_SQLITE (plugin, | ||
893 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
894 | "sqlite3_reset"); | ||
895 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 885 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
896 | } | 886 | } |
897 | 887 | ||
@@ -1062,13 +1052,15 @@ sqlite_plugin_get_key (void *cls, | |||
1062 | { | 1052 | { |
1063 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1053 | LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1064 | "sqlite_step"); | 1054 | "sqlite_step"); |
1065 | sqlite3_reset (count_stmt); | 1055 | GNUNET_SQ_reset (plugin->dbh, |
1056 | count_stmt); | ||
1066 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 1057 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
1067 | return; | 1058 | return; |
1068 | } | 1059 | } |
1069 | total = sqlite3_column_int (count_stmt, | 1060 | total = sqlite3_column_int (count_stmt, |
1070 | 0); | 1061 | 0); |
1071 | sqlite3_reset (count_stmt); | 1062 | GNUNET_SQ_reset (plugin->dbh, |
1063 | count_stmt); | ||
1072 | if (0 == total) | 1064 | if (0 == total) |
1073 | { | 1065 | { |
1074 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 1066 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
@@ -1086,7 +1078,8 @@ sqlite_plugin_get_key (void *cls, | |||
1086 | get_stmt, | 1078 | get_stmt, |
1087 | proc, | 1079 | proc, |
1088 | proc_cls); | 1080 | proc_cls); |
1089 | sqlite3_reset (get_stmt); | 1081 | GNUNET_SQ_reset (plugin->dbh, |
1082 | get_stmt); | ||
1090 | } | 1083 | } |
1091 | 1084 | ||
1092 | 1085 | ||
@@ -1205,22 +1198,16 @@ sqlite_plugin_get_replication (void *cls, | |||
1205 | if (SQLITE_ROW != | 1198 | if (SQLITE_ROW != |
1206 | sqlite3_step (plugin->maxRepl)) | 1199 | sqlite3_step (plugin->maxRepl)) |
1207 | { | 1200 | { |
1208 | if (SQLITE_OK != | 1201 | GNUNET_SQ_reset (plugin->dbh, |
1209 | sqlite3_reset (plugin->maxRepl)) | 1202 | plugin->maxRepl); |
1210 | LOG_SQLITE (plugin, | ||
1211 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1212 | "sqlite3_reset"); | ||
1213 | /* DB empty */ | 1203 | /* DB empty */ |
1214 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); | 1204 | proc (proc_cls, NULL, 0, NULL, 0, 0, 0, GNUNET_TIME_UNIT_ZERO_ABS, 0); |
1215 | return; | 1205 | return; |
1216 | } | 1206 | } |
1217 | repl = sqlite3_column_int (plugin->maxRepl, | 1207 | repl = sqlite3_column_int (plugin->maxRepl, |
1218 | 0); | 1208 | 0); |
1219 | if (SQLITE_OK != | 1209 | GNUNET_SQ_reset (plugin->dbh, |
1220 | sqlite3_reset (plugin->maxRepl)) | 1210 | plugin->maxRepl); |
1221 | LOG_SQLITE (plugin, | ||
1222 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1223 | "sqlite3_reset"); | ||
1224 | rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, | 1211 | rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, |
1225 | UINT64_MAX); | 1212 | UINT64_MAX); |
1226 | if (GNUNET_OK != | 1213 | if (GNUNET_OK != |
@@ -1251,11 +1238,8 @@ sqlite_plugin_get_replication (void *cls, | |||
1251 | LOG_SQLITE (plugin, | 1238 | LOG_SQLITE (plugin, |
1252 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1239 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1253 | "sqlite3_step"); | 1240 | "sqlite3_step"); |
1254 | if (SQLITE_OK != | 1241 | GNUNET_SQ_reset (plugin->dbh, |
1255 | sqlite3_reset (plugin->updRepl)) | 1242 | plugin->updRepl); |
1256 | LOG_SQLITE (plugin, | ||
1257 | GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1258 | "sqlite3_reset"); | ||
1259 | } | 1243 | } |
1260 | if (GNUNET_SYSERR == rc.have_uid) | 1244 | if (GNUNET_SYSERR == rc.have_uid) |
1261 | { | 1245 | { |