gnunet-svn
[Top][All Lists]
Advanced

[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: Fri, 28 Jul 2023 17:52:58 +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 17c852381a483b943273cdebbf48f23d2919c278
Merge: 9ff4a49c0 3e5ca0f15
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Jul 28 17:52:29 2023 +0200

    Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
    
    NEWS: -

 src/include/gnunet_pq_lib.h | 115 ++++++++++++++++++++++++++++----------------
 src/pq/pq_connect.c         |  66 +++++++++++++++++++++++++
 src/pq/test_pq.c            |  35 ++++++++++++++
 3 files changed, 175 insertions(+), 41 deletions(-)

diff --cc src/include/gnunet_pq_lib.h
index edb0519b0,3b960df70..ff59a63b9
--- a/src/include/gnunet_pq_lib.h
+++ b/src/include/gnunet_pq_lib.h
@@@ -131,13 -132,13 +132,13 @@@ GNUNET_PQ_cleanup_query_params_closure
   * End of query parameter specification.
   */
  #define GNUNET_PQ_query_param_end \
--  {                               \
--    .conv = NULL,                 \
--    .conv_cls = NULL,             \
--    .data = NULL,                 \
--    .size = 0,                    \
--    .num_params = 0               \
--  }
++        {                               \
++          .conv = NULL,                 \
++          .conv_cls = NULL,             \
++          .data = NULL,                 \
++          .size = 0,                    \
++          .num_params = 0               \
++        }
  
  
  /**
@@@ -312,10 -345,10 +345,10 @@@ GNUNET_PQ_query_param_array_bytes_same_
   * @return query parameter to use
   */
  #define GNUNET_PQ_query_param_array_auto_from_type(num, elements, db) \
--  GNUNET_PQ_query_param_array_bytes_same_size ((num), \
--                                               (elements), \
--                                               sizeof(*(elements)), \
--                                               (db))
++        GNUNET_PQ_query_param_array_bytes_same_size ((num), \
++                                                     (elements), \
++                                                     sizeof(*(elements)), \
++                                                     (db))
  
  /**
   * Generate query parameter for an array of pointers to buffers @a elements,
@@@ -345,10 -378,10 +378,10 @@@ GNUNET_PQ_query_param_array_ptrs_bytes_
   * @return query parameter to use
   */
  #define GNUNET_PQ_query_param_array_ptrs_auto_from_type(num, elements, db) \
--  GNUNET_PQ_query_param_array_ptrs_bytes_same_size ((num), \
--                                                    (elements), \
--                                                    sizeof(*(elements[0])), \
--                                                    (db))
++        GNUNET_PQ_query_param_array_ptrs_bytes_same_size ((num), \
++                                                          (elements), \
++                                                          
sizeof(*(elements[0])), \
++                                                          (db))
  
  
  /**
@@@ -388,7 -421,7 +421,7 @@@ GNUNET_PQ_query_param_array_ptrs_strin
   * @return query parameter to use
   */
  #define GNUNET_PQ_query_param_auto_from_type(x) \
--  GNUNET_PQ_query_param_fixed_size ((x), sizeof(*(x)))
++        GNUNET_PQ_query_param_fixed_size ((x), sizeof(*(x)))
  
  /**
   * Generate query parameter for an array of absolute time stamps (continuous)
@@@ -679,17 -712,17 +712,17 @@@ struct GNUNET_PQ_ResultSpe
   * @return array last entry for the result specification to use
   */
  #define GNUNET_PQ_result_spec_end         \
--  {                                       \
--    .conv = NULL,                         \
--    .cleaner = NULL,                      \
--    .cls = NULL,                          \
--    .dst = NULL,                          \
--    .dst_size = 0,                        \
--    .fname = NULL,                        \
--    .result_size = NULL,                  \
--    .is_nullable = false,                 \
--    .is_null = NULL                       \
--  }
++        {                                       \
++          .conv = NULL,                         \
++          .cleaner = NULL,                      \
++          .cls = NULL,                          \
++          .dst = NULL,                          \
++          .dst_size = 0,                        \
++          .fname = NULL,                        \
++          .result_size = NULL,                  \
++          .is_nullable = false,                 \
++          .is_null = NULL                       \
++        }
  
  
  /**
@@@ -742,7 -775,7 +775,7 @@@ GNUNET_PQ_result_spec_fixed_size (cons
   * @return array entry for the result specification to use
   */
  #define GNUNET_PQ_result_spec_auto_from_type(name, dst) \
--  GNUNET_PQ_result_spec_fixed_size (name, (dst), sizeof(*(dst)))
++        GNUNET_PQ_result_spec_fixed_size (name, (dst), sizeof(*(dst)))
  
  
  /**
@@@ -1050,12 -1083,12 +1083,12 @@@ GNUNET_PQ_result_spec_array_fixed_size 
   * @return array entry for the result specification to use
   */
  #define GNUNET_PQ_result_spec_auto_array_from_type(db, name, num, dst) \
--  GNUNET_PQ_result_spec_array_fixed_size ( \
--    (db), \
--    (name), \
--    sizeof(*(dst)), \
--    (num), \
--    (void *) &(dst))
++        GNUNET_PQ_result_spec_array_fixed_size ( \
++          (db), \
++          (name), \
++          sizeof(*(dst)), \
++          (num), \
++          (void *) &(dst))
  
  
  /**
@@@ -1247,9 -1280,9 +1280,9 @@@ struct GNUNET_PQ_PreparedStatemen
   * Terminator for prepared statement list.
   */
  #define GNUNET_PQ_PREPARED_STATEMENT_END \
--  {                                      \
--    NULL, NULL                           \
--  }
++        {                                      \
++          NULL, NULL                           \
++        }
  
  
  /**
@@@ -1319,9 -1352,9 +1352,9 @@@ struct GNUNET_PQ_ExecuteStatemen
   * Terminator for executable statement list.
   */
  #define GNUNET_PQ_EXECUTE_STATEMENT_END \
--  {                                     \
--    NULL, GNUNET_SYSERR                 \
--  }
++        {                                     \
++          NULL, GNUNET_SYSERR                 \
++        }
  
  
  /**

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]