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/datacache | |
| parent | 9173da4f8c1f4b50ccd9d61f6fa138904740ecfa (diff) | |
| parent | d748b0c920b0581ca65962f34d1f2e94c9a89926 (diff) | |
| download | gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.tar.gz gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.zip | |
-fix conflict
Diffstat (limited to 'src/datacache')
| -rw-r--r-- | src/datacache/plugin_datacache_postgres.c | 4 | ||||
| -rw-r--r-- | src/datacache/plugin_datacache_sqlite.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 01b2372f1..df5fc4454 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c | |||
| @@ -211,7 +211,7 @@ struct HandleResultContext | |||
| 211 | * | 211 | * |
| 212 | * @param cls closure of type `struct HandleResultContext` | 212 | * @param cls closure of type `struct HandleResultContext` |
| 213 | * @param result the postgres result | 213 | * @param result the postgres result |
| 214 | * @param num_result the number of results in @a result | 214 | * @param num_results the number of results in @a result |
| 215 | */ | 215 | */ |
| 216 | static void | 216 | static void |
| 217 | handle_results (void *cls, | 217 | handle_results (void *cls, |
| @@ -433,7 +433,7 @@ struct ExtractResultContext | |||
| 433 | * | 433 | * |
| 434 | * @param cls closure with the `struct ExtractResultContext` | 434 | * @param cls closure with the `struct ExtractResultContext` |
| 435 | * @param result the postgres result | 435 | * @param result the postgres result |
| 436 | * @param num_result the number of results in @a result | 436 | * @param num_results the number of results in @a result |
| 437 | */ | 437 | */ |
| 438 | static void | 438 | static void |
| 439 | extract_result_cb (void *cls, | 439 | extract_result_cb (void *cls, |
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 0753d87ce..1c6f24a82 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c | |||
| @@ -161,7 +161,7 @@ struct Plugin | |||
| 161 | * @brief Prepare a SQL statement | 161 | * @brief Prepare a SQL statement |
| 162 | * | 162 | * |
| 163 | * @param dbh database handle | 163 | * @param dbh database handle |
| 164 | * @param zsql SQL statement text | 164 | * @param zSql SQL statement text |
| 165 | * @param[out] ppStmt set to the prepared statement | 165 | * @param[out] ppStmt set to the prepared statement |
| 166 | * @return 0 on success | 166 | * @return 0 on success |
| 167 | */ | 167 | */ |