mdbx: использование clang-format-19.

mdbx.h++

@@ -2255,14 +2255,16 @@ public:
 
   buffer(const char *c_str, bool make_reference,
          const allocator_type &allocator = allocator_type())
-      : buffer(::mdbx::slice(c_str), make_reference, allocator) {}
+      : buffer(::mdbx::slice(c_str), make_reference, allocator){}
 
 #if defined(DOXYGEN) ||                                                        \
     (defined(__cpp_lib_string_view) && __cpp_lib_string_view >= 201606L)
-  template <class CHAR, class T>
+        template <class CHAR, class T>
-  buffer(const ::std::basic_string_view<CHAR, T> &view, bool make_reference,
+        buffer(const ::std::basic_string_view<CHAR, T> &view,
-         const allocator_type &allocator = allocator_type())
+               bool make_reference,
-      : buffer(::mdbx::slice(view), make_reference, allocator) {}
+               const allocator_type &allocator = allocator_type())
+      : buffer(::mdbx::slice(view), make_reference, allocator) {
+  }
 #endif /* __cpp_lib_string_view >= 201606L */
 
   MDBX_CXX20_CONSTEXPR
@@ -2288,15 +2290,16 @@ public:
 
   MDBX_CXX20_CONSTEXPR
   buffer(const char *c_str, const allocator_type &allocator = allocator_type())
-      : buffer(::mdbx::slice(c_str), allocator) {}
+      : buffer(::mdbx::slice(c_str), allocator){}
 
 #if defined(DOXYGEN) ||                                                        \
     (defined(__cpp_lib_string_view) && __cpp_lib_string_view >= 201606L)
-  template <class CHAR, class T>
+        template <class CHAR, class T>
-  MDBX_CXX20_CONSTEXPR
+        MDBX_CXX20_CONSTEXPR
-  buffer(const ::std::basic_string_view<CHAR, T> &view,
+        buffer(const ::std::basic_string_view<CHAR, T> &view,
-         const allocator_type &allocator = allocator_type())
+               const allocator_type &allocator = allocator_type())
-      : buffer(::mdbx::slice(view), allocator) {}
+      : buffer(::mdbx::slice(view), allocator) {
+  }
 #endif /* __cpp_lib_string_view >= 201606L */
 
   buffer(size_t head_room, size_t tail_room,

src/base.h

@@ -505,7 +505,7 @@ __extern_C key_t ftok(const char *, int);
 
 #ifndef container_of
 #define container_of(ptr, type, member)                                        \
-  ((type *)((char *)(ptr)-offsetof(type, member)))
+  ((type *)((char *)(ptr) - offsetof(type, member)))
 #endif /* container_of */
 
 /*----------------------------------------------------------------------------*/

src/core.c

@@ -428,7 +428,7 @@ node_largedata_pgno(const MDBX_node *const __restrict node) {
  *                                 max(DATALEN_NO_OVERFLOW, sizeof(MDBX_db));
  */
 
-#define PAGEROOM(pagesize) ((pagesize)-PAGEHDRSZ)
+#define PAGEROOM(pagesize) ((pagesize) - PAGEHDRSZ)
 #define EVEN_FLOOR(n) ((n) & ~(size_t)1)
 #define BRANCH_NODE_MAX(pagesize)                                              \
   (EVEN_FLOOR((PAGEROOM(pagesize) - sizeof(indx_t) - NODESIZE) / (3 - 1) -     \
@@ -3187,9 +3187,9 @@ static __always_inline int __must_check_result dpl_append(MDBX_txn *txn,
       STATIC_ASSERT(sizeof(MDBX_dp) == sizeof(__uint128_t));
       ((__uint128_t *)i)[1] = *(volatile __uint128_t *)i;
 #else
-      i[1].ptr = i->ptr;
+    i[1].ptr = i->ptr;
-      i[1].pgno = i->pgno;
+    i[1].pgno = i->pgno;
-      i[1].npages = i->npages;
+    i[1].npages = i->npages;
 #endif
       --i;
     }
@@ -3787,7 +3787,9 @@ MDBX_MAYBE_UNUSED static bool cursor_is_tracked(const MDBX_cursor *mc) {
     }                                                                          \
     tracked->mc_next = *tracking_head;                                         \
     *tracking_head = tracked;                                                  \
-    { act; }                                                                   \
+    {                                                                          \
+      act;                                                                     \
+    }                                                                          \
     *tracking_head = tracked->mc_next;                                         \
   } while (0)
 

src/internals.h

@@ -90,8 +90,8 @@
 #endif
 #if _MSC_VER > 1914
 #pragma warning(                                                               \
-        disable : 5105) /* winbase.h(9531): warning C5105: macro expansion     \
+    disable : 5105) /* winbase.h(9531): warning C5105: macro expansion         \
-                           producing 'defined' has undefined behavior */
+                       producing 'defined' has undefined behavior */
 #endif
 #if _MSC_VER > 1930
 #pragma warning(disable : 6235) /* <expression> is always a constant */
@@ -120,8 +120,8 @@
 #pragma warning(disable : 4204) /* nonstandard extension used: non-constant    \
                                    aggregate initializer */
 #pragma warning(                                                               \
-        disable : 4505) /* unreferenced local function has been removed */
+    disable : 4505) /* unreferenced local function has been removed */
-#endif                  /* _MSC_VER (warnings) */
+#endif              /* _MSC_VER (warnings) */
 
 #if defined(__GNUC__) && __GNUC__ < 9
 #pragma GCC diagnostic ignored "-Wattributes"
@@ -684,7 +684,7 @@ typedef struct MDBX_page {
 #define P_LOOSE 0x4000u      /* page was dirtied then freed, can be reused */
 #define P_FROZEN 0x8000u     /* used for retire page with known status */
 #define P_ILL_BITS                                                             \
-  ((uint16_t) ~(P_BRANCH | P_LEAF | P_LEAF2 | P_OVERFLOW | P_SPILLED))
+  ((uint16_t)~(P_BRANCH | P_LEAF | P_LEAF2 | P_OVERFLOW | P_SPILLED))
   uint16_t mp_flags;
   union {
     uint32_t mp_pages; /* number of overflow pages */
@@ -1303,8 +1303,8 @@ struct MDBX_cursor {
 #define C_SUB 0x04         /* Cursor is a sub-cursor */
 #define C_DEL 0x08         /* last op was a cursor_del */
 #define C_UNTRACK 0x10     /* Un-track cursor when closing */
-#define C_GCU                                                                                  \
+#define C_GCU                                                                  \
-  0x20 /* Происходит подготовка к обновлению GC, поэтому \
+  0x20 /* Происходит подготовка к обновлению GC, поэтому                     \
         * можно брать страницы из GC даже для FREE_DBI */
   uint8_t mc_flags;
 

src/lck-posix.c

@@ -691,16 +691,16 @@ __cold MDBX_INTERNAL_FUNC int osal_lck_init(MDBX_env *env,
       if LCK already opened/used inside current process */
         ;
 
-    /* FIXME: Unfortunately, there is no other reliable way but to long testing
+  /* FIXME: Unfortunately, there is no other reliable way but to long testing
-     * on each platform. On the other hand, behavior like FreeBSD is incorrect
+   * on each platform. On the other hand, behavior like FreeBSD is incorrect
-     * and we can expect it to be rare. Moreover, even on FreeBSD without
+   * and we can expect it to be rare. Moreover, even on FreeBSD without
-     * additional in-process initialization, the probability of an problem
+   * additional in-process initialization, the probability of an problem
-     * occurring is vanishingly small, and the symptom is a return of EINVAL
+   * occurring is vanishingly small, and the symptom is a return of EINVAL
-     * while locking a mutex. In other words, in the worst case, the problem
+   * while locking a mutex. In other words, in the worst case, the problem
-     * results in an EINVAL error at the start of the transaction, but NOT data
+   * results in an EINVAL error at the start of the transaction, but NOT data
-     * loss, nor database corruption, nor other fatal troubles. Thus, the code
+   * loss, nor database corruption, nor other fatal troubles. Thus, the code
-     * below I am inclined to think the workaround for erroneous platforms (like
+   * below I am inclined to think the workaround for erroneous platforms (like
-     * FreeBSD), rather than a defect of libmdbx. */
+   * FreeBSD), rather than a defect of libmdbx. */
 #if defined(__FreeBSD__)
   /* seems that shared mutexes on FreeBSD required in-process initialization */
   (void)global_uniqueness_flag;

src/mdbx.c++

@@ -1647,21 +1647,20 @@ __cold ::std::ostream &operator<<(::std::ostream &out,
     const char *suffix;
   } static const scales[] = {
 #if MDBX_WORDBITS > 32
-    {env_managed::geometry::EiB, "EiB"},
+      {env_managed::geometry::EiB, "EiB"},
-    {env_managed::geometry::EB, "EB"},
+      {env_managed::geometry::EB, "EB"},
-    {env_managed::geometry::PiB, "PiB"},
+      {env_managed::geometry::PiB, "PiB"},
-    {env_managed::geometry::PB, "PB"},
+      {env_managed::geometry::PB, "PB"},
-    {env_managed::geometry::TiB, "TiB"},
+      {env_managed::geometry::TiB, "TiB"},
-    {env_managed::geometry::TB, "TB"},
+      {env_managed::geometry::TB, "TB"},
 #endif
-    {env_managed::geometry::GiB, "GiB"},
+      {env_managed::geometry::GiB, "GiB"},
-    {env_managed::geometry::GB, "GB"},
+      {env_managed::geometry::GB, "GB"},
-    {env_managed::geometry::MiB, "MiB"},
+      {env_managed::geometry::MiB, "MiB"},
-    {env_managed::geometry::MB, "MB"},
+      {env_managed::geometry::MB, "MB"},
-    {env_managed::geometry::KiB, "KiB"},
+      {env_managed::geometry::KiB, "KiB"},
-    {env_managed::geometry::kB, "kB"},
+      {env_managed::geometry::kB, "kB"},
-    {1, " bytes"}
+      {1, " bytes"}};
-  };
 
   for (const auto i : scales)
     if (bytes % i.one == 0)

src/osal.c

@@ -3398,16 +3398,15 @@ __cold int mdbx_get_sysraminfo(intptr_t *page_size, intptr_t *total_pages,
 #elif defined(HW_USERMEM) || defined(HW_PHYSMEM64) || defined(HW_MEMSIZE) ||   \
     defined(HW_PHYSMEM)
     size_t ram, len = sizeof(ram);
-    static const int mib[] = {
+    static const int mib[] = {CTL_HW,
-      CTL_HW,
 #if defined(HW_USERMEM)
-      HW_USERMEM
+                              HW_USERMEM
 #elif defined(HW_PHYSMEM64)
-      HW_PHYSMEM64
+                              HW_PHYSMEM64
 #elif defined(HW_MEMSIZE)
-      HW_MEMSIZE
+                              HW_MEMSIZE
 #else
-      HW_PHYSMEM
+                              HW_PHYSMEM
 #endif
     };
     if (sysctl(
@@ -3448,12 +3447,11 @@ __cold int mdbx_get_sysraminfo(intptr_t *page_size, intptr_t *total_pages,
 #elif defined(VM_TOTAL) || defined(VM_METER)
     struct vmtotal info;
     size_t len = sizeof(info);
-    static const int mib[] = {
+    static const int mib[] = {CTL_VM,
-      CTL_VM,
 #if defined(VM_TOTAL)
-      VM_TOTAL
+                              VM_TOTAL
 #elif defined(VM_METER)
-      VM_METER
+                              VM_METER
 #endif
     };
     if (sysctl(

test/extra/pcrf/pcrf_test.c

@@ -34,7 +34,7 @@
 
 #define IP_PRINTF_ARG_HOST(addr)                                               \
   (int)((addr) >> 24), (int)((addr) >> 16 & 0xff), (int)((addr) >> 8 & 0xff),  \
-      (int)((addr)&0xff)
+      (int)((addr) & 0xff)
 
 char opt_db_path[PATH_MAX] = "./mdbx_bench2";
 static MDBX_env *env;

test/utils.h++

@@ -41,7 +41,7 @@
 
 #if _MSC_FULL_VER < 190024215
 #pragma message(                                                               \
-        "It is recommended to use Visual Studio 2015 (MSC 19.0) or newer.")
+    "It is recommended to use Visual Studio 2015 (MSC 19.0) or newer.")
 #endif
 
 #define bswap64(v) _byteswap_uint64(v)