diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-18 10:04:57 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-18 10:04:57 +0900 |
commit | c9562b8cf7a29f4ec2457cb9d9d4530c24225da1 (patch) | |
tree | fb7d0296af5537ddda7e772a46e959c8ed64fbac /src/include/gnunet_pq_lib.h | |
parent | 9173da4f8c1f4b50ccd9d61f6fa138904740ecfa (diff) | |
parent | d748b0c920b0581ca65962f34d1f2e94c9a89926 (diff) | |
download | gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.tar.gz gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.zip |
-fix conflict
Diffstat (limited to 'src/include/gnunet_pq_lib.h')
-rw-r--r-- | src/include/gnunet_pq_lib.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h index 7396c6861..d52c0e40d 100644 --- a/src/include/gnunet_pq_lib.h +++ b/src/include/gnunet_pq_lib.h | |||
@@ -118,7 +118,7 @@ GNUNET_PQ_query_param_null (void); | |||
118 | * @a ptr_size bytes. | 118 | * @a ptr_size bytes. |
119 | * | 119 | * |
120 | * @param ptr pointer to the query parameter to pass | 120 | * @param ptr pointer to the query parameter to pass |
121 | * @oaran ptr_size number of bytes in @a ptr | 121 | * @param ptr_size number of bytes in @a ptr |
122 | * @return query parameter to use | 122 | * @return query parameter to use |
123 | */ | 123 | */ |
124 | struct GNUNET_PQ_QueryParam | 124 | struct GNUNET_PQ_QueryParam |
@@ -235,7 +235,7 @@ GNUNET_PQ_query_param_absolute_time_nbo ( | |||
235 | */ | 235 | */ |
236 | struct GNUNET_PQ_QueryParam | 236 | struct GNUNET_PQ_QueryParam |
237 | GNUNET_PQ_query_param_timestamp_nbo ( | 237 | GNUNET_PQ_query_param_timestamp_nbo ( |
238 | const struct GNUNET_TIME_TimestampNBO *t); | 238 | const struct GNUNET_TIME_TimestampNBO *x); |
239 | 239 | ||
240 | 240 | ||
241 | /** | 241 | /** |
@@ -861,7 +861,7 @@ GNUNET_PQ_make_try_execute (const char *sql); | |||
861 | /** | 861 | /** |
862 | * Request execution of an array of statements @a es from Postgres. | 862 | * Request execution of an array of statements @a es from Postgres. |
863 | * | 863 | * |
864 | * @param pq database to execute the statements in | 864 | * @param db database to execute the statements in |
865 | * @param es #GNUNET_PQ_PREPARED_STATEMENT_END-terminated array of prepared | 865 | * @param es #GNUNET_PQ_PREPARED_STATEMENT_END-terminated array of prepared |
866 | * statements. | 866 | * statements. |
867 | * @return #GNUNET_OK on success (modulo statements where errors can be ignored) | 867 | * @return #GNUNET_OK on success (modulo statements where errors can be ignored) |
@@ -903,14 +903,14 @@ enum GNUNET_PQ_Options | |||
903 | * configuration. Initialize logging via GNUnet's log routines and disable | 903 | * configuration. Initialize logging via GNUnet's log routines and disable |
904 | * Postgres's logger. Also ensures that the statements in @a load_path and @a | 904 | * Postgres's logger. Also ensures that the statements in @a load_path and @a |
905 | * es are executed whenever we (re)connect to the database, and that the | 905 | * es are executed whenever we (re)connect to the database, and that the |
906 | * prepared statements in @a ps are "ready". If statements in @es fail that | 906 | * prepared statements in @a ps are "ready". If statements in @a es fail that |
907 | * were created with #GNUNET_PQ_make_execute(), then the entire operation | 907 | * were created with #GNUNET_PQ_make_execute(), then the entire operation |
908 | * fails. | 908 | * fails. |
909 | * | 909 | * |
910 | * In @a load_path, a list of "$XXXX.sql" files is expected where $XXXX | 910 | * In @a load_path, a list of "$XXXX.sql" files is expected where $XXXX |
911 | * must be a sequence of contiguous integer values starting at 0000. | 911 | * must be a sequence of contiguous integer values starting at 0000. |
912 | * These files are then loaded in sequence using "psql $config_str" before | 912 | * These files are then loaded in sequence using "psql $config_str" before |
913 | * running statements from @e es. The directory is inspected again on | 913 | * running statements from @a es. The directory is inspected again on |
914 | * reconnect. | 914 | * reconnect. |
915 | * | 915 | * |
916 | * @param config_str configuration to use | 916 | * @param config_str configuration to use |
@@ -947,7 +947,7 @@ GNUNET_PQ_exec_sql (struct GNUNET_PQ_Context *db, | |||
947 | * configuration. Initialize logging via GNUnet's log routines and disable | 947 | * configuration. Initialize logging via GNUnet's log routines and disable |
948 | * Postgres's logger. Also ensures that the statements in @a load_path and @a | 948 | * Postgres's logger. Also ensures that the statements in @a load_path and @a |
949 | * es are executed whenever we (re)connect to the database, and that the | 949 | * es are executed whenever we (re)connect to the database, and that the |
950 | * prepared statements in @a ps are "ready". If statements in @es fail that | 950 | * prepared statements in @a ps are "ready". If statements in @a es fail that |
951 | * were created with #GNUNET_PQ_make_execute(), then the entire operation | 951 | * were created with #GNUNET_PQ_make_execute(), then the entire operation |
952 | * fails. | 952 | * fails. |
953 | * | 953 | * |