diff options
Diffstat (limited to 'src/include/gnunet_pq_lib.h')
-rw-r--r-- | src/include/gnunet_pq_lib.h | 158 |
1 files changed, 75 insertions, 83 deletions
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h index 1734fb94d..fcd886521 100644 --- a/src/include/gnunet_pq_lib.h +++ b/src/include/gnunet_pq_lib.h | |||
@@ -1,22 +1,22 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | Copyright (C) 2016, 2017 GNUnet e.V. | 3 | Copyright (C) 2016, 2017 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
7 | by the Free Software Foundation, either version 3 of the License, | 7 | by the Free Software Foundation, either version 3 of the License, |
8 | or (at your option) any later version. | 8 | or (at your option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file include/gnunet_pq_lib.h | 21 | * @file include/gnunet_pq_lib.h |
22 | * @brief helper functions for Postgres DB interactions | 22 | * @brief helper functions for Postgres DB interactions |
@@ -60,9 +60,7 @@ typedef int (*GNUNET_PQ_QueryConverter) (void *cls, | |||
60 | /** | 60 | /** |
61 | * @brief Description of a DB query parameter. | 61 | * @brief Description of a DB query parameter. |
62 | */ | 62 | */ |
63 | struct GNUNET_PQ_QueryParam | 63 | struct GNUNET_PQ_QueryParam { |
64 | { | ||
65 | |||
66 | /** | 64 | /** |
67 | * Function for how to handle this type of entry. | 65 | * Function for how to handle this type of entry. |
68 | */ | 66 | */ |
@@ -107,7 +105,7 @@ struct GNUNET_PQ_QueryParam | |||
107 | * @oaran ptr_size number of bytes in @a ptr | 105 | * @oaran ptr_size number of bytes in @a ptr |
108 | */ | 106 | */ |
109 | struct GNUNET_PQ_QueryParam | 107 | struct GNUNET_PQ_QueryParam |
110 | GNUNET_PQ_query_param_fixed_size (const void *ptr, size_t ptr_size); | 108 | GNUNET_PQ_query_param_fixed_size(const void *ptr, size_t ptr_size); |
111 | 109 | ||
112 | 110 | ||
113 | /** | 111 | /** |
@@ -116,7 +114,7 @@ GNUNET_PQ_query_param_fixed_size (const void *ptr, size_t ptr_size); | |||
116 | * @param ptr pointer to the string query parameter to pass | 114 | * @param ptr pointer to the string query parameter to pass |
117 | */ | 115 | */ |
118 | struct GNUNET_PQ_QueryParam | 116 | struct GNUNET_PQ_QueryParam |
119 | GNUNET_PQ_query_param_string (const char *ptr); | 117 | GNUNET_PQ_query_param_string(const char *ptr); |
120 | 118 | ||
121 | 119 | ||
122 | /** | 120 | /** |
@@ -126,7 +124,7 @@ GNUNET_PQ_query_param_string (const char *ptr); | |||
126 | * @param x pointer to the query parameter to pass. | 124 | * @param x pointer to the query parameter to pass. |
127 | */ | 125 | */ |
128 | #define GNUNET_PQ_query_param_auto_from_type(x) \ | 126 | #define GNUNET_PQ_query_param_auto_from_type(x) \ |
129 | GNUNET_PQ_query_param_fixed_size ((x), sizeof (*(x))) | 127 | GNUNET_PQ_query_param_fixed_size((x), sizeof(*(x))) |
130 | 128 | ||
131 | 129 | ||
132 | /** | 130 | /** |
@@ -136,7 +134,7 @@ GNUNET_PQ_query_param_string (const char *ptr); | |||
136 | * @param x the query parameter to pass. | 134 | * @param x the query parameter to pass. |
137 | */ | 135 | */ |
138 | struct GNUNET_PQ_QueryParam | 136 | struct GNUNET_PQ_QueryParam |
139 | GNUNET_PQ_query_param_rsa_public_key ( | 137 | GNUNET_PQ_query_param_rsa_public_key( |
140 | const struct GNUNET_CRYPTO_RsaPublicKey *x); | 138 | const struct GNUNET_CRYPTO_RsaPublicKey *x); |
141 | 139 | ||
142 | 140 | ||
@@ -147,7 +145,7 @@ GNUNET_PQ_query_param_rsa_public_key ( | |||
147 | * @param x the query parameter to pass | 145 | * @param x the query parameter to pass |
148 | */ | 146 | */ |
149 | struct GNUNET_PQ_QueryParam | 147 | struct GNUNET_PQ_QueryParam |
150 | GNUNET_PQ_query_param_rsa_signature ( | 148 | GNUNET_PQ_query_param_rsa_signature( |
151 | const struct GNUNET_CRYPTO_RsaSignature *x); | 149 | const struct GNUNET_CRYPTO_RsaSignature *x); |
152 | 150 | ||
153 | 151 | ||
@@ -158,7 +156,7 @@ GNUNET_PQ_query_param_rsa_signature ( | |||
158 | * @param x pointer to the query parameter to pass | 156 | * @param x pointer to the query parameter to pass |
159 | */ | 157 | */ |
160 | struct GNUNET_PQ_QueryParam | 158 | struct GNUNET_PQ_QueryParam |
161 | GNUNET_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x); | 159 | GNUNET_PQ_query_param_absolute_time(const struct GNUNET_TIME_Absolute *x); |
162 | 160 | ||
163 | 161 | ||
164 | /** | 162 | /** |
@@ -168,7 +166,7 @@ GNUNET_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x); | |||
168 | * @param x pointer to the query parameter to pass | 166 | * @param x pointer to the query parameter to pass |
169 | */ | 167 | */ |
170 | struct GNUNET_PQ_QueryParam | 168 | struct GNUNET_PQ_QueryParam |
171 | GNUNET_PQ_query_param_absolute_time_nbo ( | 169 | GNUNET_PQ_query_param_absolute_time_nbo( |
172 | const struct GNUNET_TIME_AbsoluteNBO *x); | 170 | const struct GNUNET_TIME_AbsoluteNBO *x); |
173 | 171 | ||
174 | 172 | ||
@@ -178,7 +176,7 @@ GNUNET_PQ_query_param_absolute_time_nbo ( | |||
178 | * @param x pointer to the query parameter to pass | 176 | * @param x pointer to the query parameter to pass |
179 | */ | 177 | */ |
180 | struct GNUNET_PQ_QueryParam | 178 | struct GNUNET_PQ_QueryParam |
181 | GNUNET_PQ_query_param_uint16 (const uint16_t *x); | 179 | GNUNET_PQ_query_param_uint16(const uint16_t *x); |
182 | 180 | ||
183 | 181 | ||
184 | /** | 182 | /** |
@@ -187,7 +185,7 @@ GNUNET_PQ_query_param_uint16 (const uint16_t *x); | |||
187 | * @param x pointer to the query parameter to pass | 185 | * @param x pointer to the query parameter to pass |
188 | */ | 186 | */ |
189 | struct GNUNET_PQ_QueryParam | 187 | struct GNUNET_PQ_QueryParam |
190 | GNUNET_PQ_query_param_uint32 (const uint32_t *x); | 188 | GNUNET_PQ_query_param_uint32(const uint32_t *x); |
191 | 189 | ||
192 | 190 | ||
193 | /** | 191 | /** |
@@ -196,7 +194,7 @@ GNUNET_PQ_query_param_uint32 (const uint32_t *x); | |||
196 | * @param x pointer to the query parameter to pass | 194 | * @param x pointer to the query parameter to pass |
197 | */ | 195 | */ |
198 | struct GNUNET_PQ_QueryParam | 196 | struct GNUNET_PQ_QueryParam |
199 | GNUNET_PQ_query_param_uint64 (const uint64_t *x); | 197 | GNUNET_PQ_query_param_uint64(const uint64_t *x); |
200 | 198 | ||
201 | 199 | ||
202 | /* ************************* pq_result_helper.c functions ************************ */ | 200 | /* ************************* pq_result_helper.c functions ************************ */ |
@@ -236,9 +234,7 @@ typedef void (*GNUNET_PQ_ResultCleanup) (void *cls, void *rd); | |||
236 | /** | 234 | /** |
237 | * @brief Description of a DB result cell. | 235 | * @brief Description of a DB result cell. |
238 | */ | 236 | */ |
239 | struct GNUNET_PQ_ResultSpec | 237 | struct GNUNET_PQ_ResultSpec { |
240 | { | ||
241 | |||
242 | /** | 238 | /** |
243 | * What is the format of the result? | 239 | * What is the format of the result? |
244 | */ | 240 | */ |
@@ -299,9 +295,9 @@ struct GNUNET_PQ_ResultSpec | |||
299 | * @return array entry for the result specification to use | 295 | * @return array entry for the result specification to use |
300 | */ | 296 | */ |
301 | struct GNUNET_PQ_ResultSpec | 297 | struct GNUNET_PQ_ResultSpec |
302 | GNUNET_PQ_result_spec_variable_size (const char *name, | 298 | GNUNET_PQ_result_spec_variable_size(const char *name, |
303 | void **dst, | 299 | void **dst, |
304 | size_t *sptr); | 300 | size_t *sptr); |
305 | 301 | ||
306 | 302 | ||
307 | /** | 303 | /** |
@@ -313,7 +309,7 @@ GNUNET_PQ_result_spec_variable_size (const char *name, | |||
313 | * @return array entry for the result specification to use | 309 | * @return array entry for the result specification to use |
314 | */ | 310 | */ |
315 | struct GNUNET_PQ_ResultSpec | 311 | struct GNUNET_PQ_ResultSpec |
316 | GNUNET_PQ_result_spec_fixed_size (const char *name, void *dst, size_t dst_size); | 312 | GNUNET_PQ_result_spec_fixed_size(const char *name, void *dst, size_t dst_size); |
317 | 313 | ||
318 | 314 | ||
319 | /** | 315 | /** |
@@ -324,7 +320,7 @@ GNUNET_PQ_result_spec_fixed_size (const char *name, void *dst, size_t dst_size); | |||
324 | * @return array entry for the result specification to use | 320 | * @return array entry for the result specification to use |
325 | */ | 321 | */ |
326 | #define GNUNET_PQ_result_spec_auto_from_type(name, dst) \ | 322 | #define GNUNET_PQ_result_spec_auto_from_type(name, dst) \ |
327 | GNUNET_PQ_result_spec_fixed_size (name, (dst), sizeof (*(dst))) | 323 | GNUNET_PQ_result_spec_fixed_size(name, (dst), sizeof(*(dst))) |
328 | 324 | ||
329 | 325 | ||
330 | /** | 326 | /** |
@@ -335,7 +331,7 @@ GNUNET_PQ_result_spec_fixed_size (const char *name, void *dst, size_t dst_size); | |||
335 | * @return array entry for the result specification to use | 331 | * @return array entry for the result specification to use |
336 | */ | 332 | */ |
337 | struct GNUNET_PQ_ResultSpec | 333 | struct GNUNET_PQ_ResultSpec |
338 | GNUNET_PQ_result_spec_string (const char *name, char **dst); | 334 | GNUNET_PQ_result_spec_string(const char *name, char **dst); |
339 | 335 | ||
340 | 336 | ||
341 | /** | 337 | /** |
@@ -346,8 +342,8 @@ GNUNET_PQ_result_spec_string (const char *name, char **dst); | |||
346 | * @return array entry for the result specification to use | 342 | * @return array entry for the result specification to use |
347 | */ | 343 | */ |
348 | struct GNUNET_PQ_ResultSpec | 344 | struct GNUNET_PQ_ResultSpec |
349 | GNUNET_PQ_result_spec_rsa_public_key (const char *name, | 345 | GNUNET_PQ_result_spec_rsa_public_key(const char *name, |
350 | struct GNUNET_CRYPTO_RsaPublicKey **rsa); | 346 | struct GNUNET_CRYPTO_RsaPublicKey **rsa); |
351 | 347 | ||
352 | 348 | ||
353 | /** | 349 | /** |
@@ -358,8 +354,8 @@ GNUNET_PQ_result_spec_rsa_public_key (const char *name, | |||
358 | * @return array entry for the result specification to use | 354 | * @return array entry for the result specification to use |
359 | */ | 355 | */ |
360 | struct GNUNET_PQ_ResultSpec | 356 | struct GNUNET_PQ_ResultSpec |
361 | GNUNET_PQ_result_spec_rsa_signature (const char *name, | 357 | GNUNET_PQ_result_spec_rsa_signature(const char *name, |
362 | struct GNUNET_CRYPTO_RsaSignature **sig); | 358 | struct GNUNET_CRYPTO_RsaSignature **sig); |
363 | 359 | ||
364 | 360 | ||
365 | /** | 361 | /** |
@@ -370,8 +366,8 @@ GNUNET_PQ_result_spec_rsa_signature (const char *name, | |||
370 | * @return array entry for the result specification to use | 366 | * @return array entry for the result specification to use |
371 | */ | 367 | */ |
372 | struct GNUNET_PQ_ResultSpec | 368 | struct GNUNET_PQ_ResultSpec |
373 | GNUNET_PQ_result_spec_absolute_time (const char *name, | 369 | GNUNET_PQ_result_spec_absolute_time(const char *name, |
374 | struct GNUNET_TIME_Absolute *at); | 370 | struct GNUNET_TIME_Absolute *at); |
375 | 371 | ||
376 | 372 | ||
377 | /** | 373 | /** |
@@ -382,8 +378,8 @@ GNUNET_PQ_result_spec_absolute_time (const char *name, | |||
382 | * @return array entry for the result specification to use | 378 | * @return array entry for the result specification to use |
383 | */ | 379 | */ |
384 | struct GNUNET_PQ_ResultSpec | 380 | struct GNUNET_PQ_ResultSpec |
385 | GNUNET_PQ_result_spec_absolute_time_nbo (const char *name, | 381 | GNUNET_PQ_result_spec_absolute_time_nbo(const char *name, |
386 | struct GNUNET_TIME_AbsoluteNBO *at); | 382 | struct GNUNET_TIME_AbsoluteNBO *at); |
387 | 383 | ||
388 | 384 | ||
389 | /** | 385 | /** |
@@ -394,7 +390,7 @@ GNUNET_PQ_result_spec_absolute_time_nbo (const char *name, | |||
394 | * @return array entry for the result specification to use | 390 | * @return array entry for the result specification to use |
395 | */ | 391 | */ |
396 | struct GNUNET_PQ_ResultSpec | 392 | struct GNUNET_PQ_ResultSpec |
397 | GNUNET_PQ_result_spec_uint16 (const char *name, uint16_t *u16); | 393 | GNUNET_PQ_result_spec_uint16(const char *name, uint16_t *u16); |
398 | 394 | ||
399 | 395 | ||
400 | /** | 396 | /** |
@@ -405,7 +401,7 @@ GNUNET_PQ_result_spec_uint16 (const char *name, uint16_t *u16); | |||
405 | * @return array entry for the result specification to use | 401 | * @return array entry for the result specification to use |
406 | */ | 402 | */ |
407 | struct GNUNET_PQ_ResultSpec | 403 | struct GNUNET_PQ_ResultSpec |
408 | GNUNET_PQ_result_spec_uint32 (const char *name, uint32_t *u32); | 404 | GNUNET_PQ_result_spec_uint32(const char *name, uint32_t *u32); |
409 | 405 | ||
410 | 406 | ||
411 | /** | 407 | /** |
@@ -416,7 +412,7 @@ GNUNET_PQ_result_spec_uint32 (const char *name, uint32_t *u32); | |||
416 | * @return array entry for the result specification to use | 412 | * @return array entry for the result specification to use |
417 | */ | 413 | */ |
418 | struct GNUNET_PQ_ResultSpec | 414 | struct GNUNET_PQ_ResultSpec |
419 | GNUNET_PQ_result_spec_uint64 (const char *name, uint64_t *u64); | 415 | GNUNET_PQ_result_spec_uint64(const char *name, uint64_t *u64); |
420 | 416 | ||
421 | 417 | ||
422 | /* ************************* pq.c functions ************************ */ | 418 | /* ************************* pq.c functions ************************ */ |
@@ -431,9 +427,9 @@ GNUNET_PQ_result_spec_uint64 (const char *name, uint64_t *u64); | |||
431 | * @deprecated (should become an internal API) | 427 | * @deprecated (should become an internal API) |
432 | */ | 428 | */ |
433 | PGresult * | 429 | PGresult * |
434 | GNUNET_PQ_exec_prepared (PGconn *db_conn, | 430 | GNUNET_PQ_exec_prepared(PGconn *db_conn, |
435 | const char *name, | 431 | const char *name, |
436 | const struct GNUNET_PQ_QueryParam *params); | 432 | const struct GNUNET_PQ_QueryParam *params); |
437 | 433 | ||
438 | 434 | ||
439 | /** | 435 | /** |
@@ -448,9 +444,9 @@ GNUNET_PQ_exec_prepared (PGconn *db_conn, | |||
448 | * @deprecated (should become an internal API) | 444 | * @deprecated (should become an internal API) |
449 | */ | 445 | */ |
450 | int | 446 | int |
451 | GNUNET_PQ_extract_result (PGresult *result, | 447 | GNUNET_PQ_extract_result(PGresult *result, |
452 | struct GNUNET_PQ_ResultSpec *rs, | 448 | struct GNUNET_PQ_ResultSpec *rs, |
453 | int row); | 449 | int row); |
454 | 450 | ||
455 | 451 | ||
456 | /** | 452 | /** |
@@ -460,7 +456,7 @@ GNUNET_PQ_extract_result (PGresult *result, | |||
460 | * @param rs reult specification to clean up | 456 | * @param rs reult specification to clean up |
461 | */ | 457 | */ |
462 | void | 458 | void |
463 | GNUNET_PQ_cleanup_result (struct GNUNET_PQ_ResultSpec *rs); | 459 | GNUNET_PQ_cleanup_result(struct GNUNET_PQ_ResultSpec *rs); |
464 | 460 | ||
465 | 461 | ||
466 | /* ******************** pq_eval.c functions ************** */ | 462 | /* ******************** pq_eval.c functions ************** */ |
@@ -480,9 +476,9 @@ GNUNET_PQ_cleanup_result (struct GNUNET_PQ_ResultSpec *rs); | |||
480 | * @deprecated (low level, let's see if we can do with just the high-level functions) | 476 | * @deprecated (low level, let's see if we can do with just the high-level functions) |
481 | */ | 477 | */ |
482 | enum GNUNET_DB_QueryStatus | 478 | enum GNUNET_DB_QueryStatus |
483 | GNUNET_PQ_eval_result (PGconn *connection, | 479 | GNUNET_PQ_eval_result(PGconn *connection, |
484 | const char *statement_name, | 480 | const char *statement_name, |
485 | PGresult *result); | 481 | PGresult *result); |
486 | 482 | ||
487 | 483 | ||
488 | /** | 484 | /** |
@@ -502,9 +498,9 @@ GNUNET_PQ_eval_result (PGconn *connection, | |||
502 | * zero; if INSERT was successful, we return one. | 498 | * zero; if INSERT was successful, we return one. |
503 | */ | 499 | */ |
504 | enum GNUNET_DB_QueryStatus | 500 | enum GNUNET_DB_QueryStatus |
505 | GNUNET_PQ_eval_prepared_non_select (PGconn *connection, | 501 | GNUNET_PQ_eval_prepared_non_select(PGconn *connection, |
506 | const char *statement_name, | 502 | const char *statement_name, |
507 | const struct GNUNET_PQ_QueryParam *params); | 503 | const struct GNUNET_PQ_QueryParam *params); |
508 | 504 | ||
509 | 505 | ||
510 | /** | 506 | /** |
@@ -536,11 +532,11 @@ typedef void (*GNUNET_PQ_PostgresResultHandler) (void *cls, | |||
536 | * codes to `enum GNUNET_DB_QueryStatus`. | 532 | * codes to `enum GNUNET_DB_QueryStatus`. |
537 | */ | 533 | */ |
538 | enum GNUNET_DB_QueryStatus | 534 | enum GNUNET_DB_QueryStatus |
539 | GNUNET_PQ_eval_prepared_multi_select (PGconn *connection, | 535 | GNUNET_PQ_eval_prepared_multi_select(PGconn *connection, |
540 | const char *statement_name, | 536 | const char *statement_name, |
541 | const struct GNUNET_PQ_QueryParam *params, | 537 | const struct GNUNET_PQ_QueryParam *params, |
542 | GNUNET_PQ_PostgresResultHandler rh, | 538 | GNUNET_PQ_PostgresResultHandler rh, |
543 | void *rh_cls); | 539 | void *rh_cls); |
544 | 540 | ||
545 | 541 | ||
546 | /** | 542 | /** |
@@ -559,7 +555,7 @@ GNUNET_PQ_eval_prepared_multi_select (PGconn *connection, | |||
559 | * codes to `enum GNUNET_DB_QueryStatus`. | 555 | * codes to `enum GNUNET_DB_QueryStatus`. |
560 | */ | 556 | */ |
561 | enum GNUNET_DB_QueryStatus | 557 | enum GNUNET_DB_QueryStatus |
562 | GNUNET_PQ_eval_prepared_singleton_select ( | 558 | GNUNET_PQ_eval_prepared_singleton_select( |
563 | PGconn *connection, | 559 | PGconn *connection, |
564 | const char *statement_name, | 560 | const char *statement_name, |
565 | const struct GNUNET_PQ_QueryParam *params, | 561 | const struct GNUNET_PQ_QueryParam *params, |
@@ -573,9 +569,7 @@ GNUNET_PQ_eval_prepared_singleton_select ( | |||
573 | * Information needed to prepare a list of SQL statements using | 569 | * Information needed to prepare a list of SQL statements using |
574 | * #GNUNET_PQ_prepare_statements(). | 570 | * #GNUNET_PQ_prepare_statements(). |
575 | */ | 571 | */ |
576 | struct GNUNET_PQ_PreparedStatement | 572 | struct GNUNET_PQ_PreparedStatement { |
577 | { | ||
578 | |||
579 | /** | 573 | /** |
580 | * Name of the statement. | 574 | * Name of the statement. |
581 | */ | 575 | */ |
@@ -611,9 +605,9 @@ struct GNUNET_PQ_PreparedStatement | |||
611 | * @return initialized struct | 605 | * @return initialized struct |
612 | */ | 606 | */ |
613 | struct GNUNET_PQ_PreparedStatement | 607 | struct GNUNET_PQ_PreparedStatement |
614 | GNUNET_PQ_make_prepare (const char *name, | 608 | GNUNET_PQ_make_prepare(const char *name, |
615 | const char *sql, | 609 | const char *sql, |
616 | unsigned int num_args); | 610 | unsigned int num_args); |
617 | 611 | ||
618 | 612 | ||
619 | /** | 613 | /** |
@@ -626,8 +620,8 @@ GNUNET_PQ_make_prepare (const char *name, | |||
626 | * #GNUNET_SYSERR on error | 620 | * #GNUNET_SYSERR on error |
627 | */ | 621 | */ |
628 | int | 622 | int |
629 | GNUNET_PQ_prepare_statements (PGconn *connection, | 623 | GNUNET_PQ_prepare_statements(PGconn *connection, |
630 | const struct GNUNET_PQ_PreparedStatement *ps); | 624 | const struct GNUNET_PQ_PreparedStatement *ps); |
631 | 625 | ||
632 | 626 | ||
633 | /* ******************** pq_exec.c functions ************** */ | 627 | /* ******************** pq_exec.c functions ************** */ |
@@ -637,9 +631,7 @@ GNUNET_PQ_prepare_statements (PGconn *connection, | |||
637 | * Information needed to run a list of SQL statements using | 631 | * Information needed to run a list of SQL statements using |
638 | * #GNUNET_PQ_exec_statements(). | 632 | * #GNUNET_PQ_exec_statements(). |
639 | */ | 633 | */ |
640 | struct GNUNET_PQ_ExecuteStatement | 634 | struct GNUNET_PQ_ExecuteStatement { |
641 | { | ||
642 | |||
643 | /** | 635 | /** |
644 | * Actual SQL statement. | 636 | * Actual SQL statement. |
645 | */ | 637 | */ |
@@ -668,7 +660,7 @@ struct GNUNET_PQ_ExecuteStatement | |||
668 | * @return initialized struct | 660 | * @return initialized struct |
669 | */ | 661 | */ |
670 | struct GNUNET_PQ_ExecuteStatement | 662 | struct GNUNET_PQ_ExecuteStatement |
671 | GNUNET_PQ_make_execute (const char *sql); | 663 | GNUNET_PQ_make_execute(const char *sql); |
672 | 664 | ||
673 | 665 | ||
674 | /** | 666 | /** |
@@ -679,7 +671,7 @@ GNUNET_PQ_make_execute (const char *sql); | |||
679 | * @return initialized struct | 671 | * @return initialized struct |
680 | */ | 672 | */ |
681 | struct GNUNET_PQ_ExecuteStatement | 673 | struct GNUNET_PQ_ExecuteStatement |
682 | GNUNET_PQ_make_try_execute (const char *sql); | 674 | GNUNET_PQ_make_try_execute(const char *sql); |
683 | 675 | ||
684 | 676 | ||
685 | /** | 677 | /** |
@@ -692,8 +684,8 @@ GNUNET_PQ_make_try_execute (const char *sql); | |||
692 | * #GNUNET_SYSERR on error | 684 | * #GNUNET_SYSERR on error |
693 | */ | 685 | */ |
694 | int | 686 | int |
695 | GNUNET_PQ_exec_statements (PGconn *connection, | 687 | GNUNET_PQ_exec_statements(PGconn *connection, |
696 | const struct GNUNET_PQ_ExecuteStatement *es); | 688 | const struct GNUNET_PQ_ExecuteStatement *es); |
697 | 689 | ||
698 | 690 | ||
699 | /* ******************** pq_connect.c functions ************** */ | 691 | /* ******************** pq_connect.c functions ************** */ |
@@ -708,7 +700,7 @@ GNUNET_PQ_exec_statements (PGconn *connection, | |||
708 | * @return NULL on error | 700 | * @return NULL on error |
709 | */ | 701 | */ |
710 | PGconn * | 702 | PGconn * |
711 | GNUNET_PQ_connect (const char *config_str); | 703 | GNUNET_PQ_connect(const char *config_str); |
712 | 704 | ||
713 | 705 | ||
714 | /** | 706 | /** |
@@ -720,8 +712,8 @@ GNUNET_PQ_connect (const char *config_str); | |||
720 | * @return the postgres handle, NULL on error | 712 | * @return the postgres handle, NULL on error |
721 | */ | 713 | */ |
722 | PGconn * | 714 | PGconn * |
723 | GNUNET_PQ_connect_with_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg, | 715 | GNUNET_PQ_connect_with_cfg(const struct GNUNET_CONFIGURATION_Handle *cfg, |
724 | const char *section); | 716 | const char *section); |
725 | 717 | ||
726 | 718 | ||
727 | #endif /* GNUNET_PQ_LIB_H_ */ | 719 | #endif /* GNUNET_PQ_LIB_H_ */ |