[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 02/02: Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
From: |
gnunet |
Subject: |
[gnunet] 02/02: Merge branch 'master' of git+ssh://git.gnunet.org/gnunet |
Date: |
Sun, 30 Jul 2023 15:30:05 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 589b06c1bb7b8aeedde5db7b10ec4bc8778f8422
Merge: f6dbfb2ad b09c82418
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Jul 30 15:29:47 2023 +0200
Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
NEWS: -
merge commit
src/include/gnunet_pq_lib.h | 79 +++++----------
src/pq/pq.h | 22 ++++-
src/pq/pq_connect.c | 230 ++++++++++++++++++--------------------------
src/pq/pq_query_helper.c | 197 +++++++++++++++++++++++++++----------
src/pq/pq_result_helper.c | 84 ++++++++++------
5 files changed, 346 insertions(+), 266 deletions(-)
diff --cc src/pq/pq_query_helper.c
index 0199f21dd,59aa875c4..2ffadbd75
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@@ -675,14 -675,14 +675,14 @@@ qconv_array
same_sized = (0 != meta->same_size);
#define RETURN_UNLESS(cond) \
-- do { \
-- if (! (cond)) \
-- { \
-- GNUNET_break ((cond)); \
-- noerror = false; \
-- goto DONE; \
-- } \
-- } while(0)
++ do { \
++ if (! (cond)) \
++ { \
++ GNUNET_break ((cond)); \
++ noerror = false; \
++ goto DONE; \
++ } \
++ } while (0)
/* Calculate sizes and check bounds */
{
diff --cc src/pq/pq_result_helper.c
index 5f6215fc1,d0cb8c4b6..4fca0e6cb
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@@ -1180,13 -1180,13 +1180,13 @@@ extract_array_generic
*((void **) dst) = NULL;
#define FAIL_IF(cond) \
-- do { \
-- if ((cond)) \
-- { \
-- GNUNET_break (! (cond)); \
-- goto FAIL; \
-- } \
-- } while(0)
++ do { \
++ if ((cond)) \
++ { \
++ GNUNET_break (! (cond)); \
++ goto FAIL; \
++ } \
++ } while (0)
col_num = PQfnumber (result, fname);
FAIL_IF (0 > col_num);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.