修复一些宏的问题

plos-clan · Jan 2, 2025 · 864458a · 864458a
1 parent 3a40950
commit 864458a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/include/data-structure/ordered-set/list.h b/include/data-structure/ordered-set/list.h
@@ -401,11 +401,12 @@ static void list_print(list_t list) {
  *\param[in] list 链表头指针
  *\param[in] node 用于迭代的节点指针变量
  */
-#define list_foreach_cnt(list, i, node, code)                                                      \
+#define list_foreach_cnt(list, i, node, ...)                                                       \
   ({                                                                                               \
     size_t i = 0;                                                                                  \
-    for (list_t node = (list); node; (node) = (node)->next, (i)++)                                 \
-      (code);                                                                                      \
+    for (list_t node = (list); node; (node) = (node)->next, (i)++) {                               \
+      (__VA_ARGS__);                                                                               \
+    }                                                                                              \
   })
 
 #define list_first_node(list, node, expr)                                                          \

diff --git a/include/define/define/base.h b/include/define/define/base.h
@@ -28,15 +28,15 @@
 #define CONCAT(a, b)  CONCAT_(a, b)
 
 #if STD_SAFE_API
-#  define __std_safe__(code) ((void)({code}))
+#  define __std_safe__(...) ((void)({__VA_ARGS__}))
 #else
-#  define __std_safe__(code) ((void)(0))
+#  define __std_safe__(...) ((void)(0))
 #endif
 
 #if SAFE_API
-#  define __safe__(code) ((void)({code}))
+#  define __safe__(...) ((void)({__VA_ARGS__}))
 #else
-#  define __safe__(code) ((void)(0))
+#  define __safe__(...) ((void)(0))
 #endif
 
 #define __ARGN_PRIVATE__(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15,     \

diff --git a/include/libc-base/asm/asm.h b/include/libc-base/asm/asm.h
@@ -59,10 +59,10 @@ finline void load_tr(size_t selector) {
   asm volatile("ltr %0\n\t" : : "m"(selector));
 }
 
-#define with_no_interrupts(code)                                                                   \
+#define with_no_interrupts(...)                                                                    \
   ({                                                                                               \
     const bool _is_sti_ = asm_is_sti;                                                              \
     asm_cli;                                                                                       \
-    (code);                                                                                        \
+    (__VA_ARGS__);                                                                                 \
     if (_is_sti_) asm_sti;                                                                         \
   })