summaryrefslogtreecommitdiff
path: root/src/sq/sq.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sq/sq.c')
-rw-r--r--src/sq/sq.c102
1 files changed, 51 insertions, 51 deletions
diff --git a/src/sq/sq.c b/src/sq/sq.c
index 6fce01322..7641cbacd 100644
--- a/src/sq/sq.c
+++ b/src/sq/sq.c
@@ -34,37 +34,37 @@
34 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error 34 * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
35 */ 35 */
36int 36int
37GNUNET_SQ_bind(sqlite3_stmt *stmt, 37GNUNET_SQ_bind (sqlite3_stmt *stmt,
38 const struct GNUNET_SQ_QueryParam *params) 38 const struct GNUNET_SQ_QueryParam *params)
39{ 39{
40 unsigned int j; 40 unsigned int j;
41 41
42 j = 1; 42 j = 1;
43 for (unsigned int i = 0; NULL != params[i].conv; i++) 43 for (unsigned int i = 0; NULL != params[i].conv; i++)
44 {
45 if (GNUNET_OK !=
46 params[i].conv (params[i].conv_cls,
47 params[i].data,
48 params[i].size,
49 stmt,
50 j))
44 { 51 {
45 if (GNUNET_OK != 52 GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
46 params[i].conv(params[i].conv_cls, 53 "sq",
47 params[i].data, 54 _ ("Failure to bind %u-th SQL parameter\n"),
48 params[i].size, 55 i);
49 stmt, 56 if (SQLITE_OK !=
50 j)) 57 sqlite3_reset (stmt))
51 { 58 {
52 GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, 59 GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
53 "sq", 60 "sq",
54 _("Failure to bind %u-th SQL parameter\n"), 61 _ ("Failure in sqlite3_reset (!)\n"));
55 i); 62 return GNUNET_SYSERR;
56 if (SQLITE_OK != 63 }
57 sqlite3_reset(stmt))
58 {
59 GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING,
60 "sq",
61 _("Failure in sqlite3_reset (!)\n"));
62 return GNUNET_SYSERR;
63 }
64 }
65 GNUNET_assert(0 != params[i].num_params);
66 j += params[i].num_params;
67 } 64 }
65 GNUNET_assert (0 != params[i].num_params);
66 j += params[i].num_params;
67 }
68 return GNUNET_OK; 68 return GNUNET_OK;
69} 69}
70 70
@@ -79,30 +79,30 @@ GNUNET_SQ_bind(sqlite3_stmt *stmt,
79 * #GNUNET_SYSERR if a result was invalid (non-existing field) 79 * #GNUNET_SYSERR if a result was invalid (non-existing field)
80 */ 80 */
81int 81int
82GNUNET_SQ_extract_result(sqlite3_stmt *result, 82GNUNET_SQ_extract_result (sqlite3_stmt *result,
83 struct GNUNET_SQ_ResultSpec *rs) 83 struct GNUNET_SQ_ResultSpec *rs)
84{ 84{
85 unsigned int j = 0; 85 unsigned int j = 0;
86 86
87 for (unsigned int i = 0; NULL != rs[i].conv; i++) 87 for (unsigned int i = 0; NULL != rs[i].conv; i++)
88 {
89 if (NULL == rs[i].result_size)
90 rs[i].result_size = &rs[i].dst_size;
91 if (GNUNET_OK !=
92 rs[i].conv (rs[i].cls,
93 result,
94 j,
95 rs[i].result_size,
96 rs[i].dst))
88 { 97 {
89 if (NULL == rs[i].result_size) 98 for (unsigned int k = 0; k < i; k++)
90 rs[i].result_size = &rs[i].dst_size; 99 if (NULL != rs[k].cleaner)
91 if (GNUNET_OK != 100 rs[k].cleaner (rs[k].cls);
92 rs[i].conv(rs[i].cls, 101 return GNUNET_SYSERR;
93 result,
94 j,
95 rs[i].result_size,
96 rs[i].dst))
97 {
98 for (unsigned int k = 0; k < i; k++)
99 if (NULL != rs[k].cleaner)
100 rs[k].cleaner(rs[k].cls);
101 return GNUNET_SYSERR;
102 }
103 GNUNET_assert(0 != rs[i].num_params);
104 j += rs[i].num_params;
105 } 102 }
103 GNUNET_assert (0 != rs[i].num_params);
104 j += rs[i].num_params;
105 }
106 return GNUNET_OK; 106 return GNUNET_OK;
107} 107}
108 108
@@ -114,11 +114,11 @@ GNUNET_SQ_extract_result(sqlite3_stmt *result,
114 * @param rs reult specification to clean up 114 * @param rs reult specification to clean up
115 */ 115 */
116void 116void
117GNUNET_SQ_cleanup_result(struct GNUNET_SQ_ResultSpec *rs) 117GNUNET_SQ_cleanup_result (struct GNUNET_SQ_ResultSpec *rs)
118{ 118{
119 for (unsigned int i = 0; NULL != rs[i].conv; i++) 119 for (unsigned int i = 0; NULL != rs[i].conv; i++)
120 if (NULL != rs[i].cleaner) 120 if (NULL != rs[i].cleaner)
121 rs[i].cleaner(rs[i].cls); 121 rs[i].cleaner (rs[i].cls);
122} 122}
123 123
124 124
@@ -129,15 +129,15 @@ GNUNET_SQ_cleanup_result(struct GNUNET_SQ_ResultSpec *rs)
129 * @param stmt statement to reset 129 * @param stmt statement to reset
130 */ 130 */
131void 131void
132GNUNET_SQ_reset(sqlite3 *dbh, 132GNUNET_SQ_reset (sqlite3 *dbh,
133 sqlite3_stmt *stmt) 133 sqlite3_stmt *stmt)
134{ 134{
135 if (SQLITE_OK != 135 if (SQLITE_OK !=
136 sqlite3_reset(stmt)) 136 sqlite3_reset (stmt))
137 GNUNET_log_from(GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, 137 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
138 "sqlite", 138 "sqlite",
139 _("Failed to reset sqlite statement with error: %s\n"), 139 _ ("Failed to reset sqlite statement with error: %s\n"),
140 sqlite3_errmsg(dbh)); 140 sqlite3_errmsg (dbh));
141} 141}
142 142
143 143