When possible use simpler LOG_* macros instead of LOG_*F

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / intrusivelist.qh

diff --git a/qcsrc/lib/intrusivelist.qh b/qcsrc/lib/intrusivelist.qh
index fc0e080eae32fa103333559653d439a403895cb2..279210fb1808040aae9479d827fc43e5a3135ce4 100644 (file)
--- a/qcsrc/lib/intrusivelist.qh
+++ b/qcsrc/lib/intrusivelist.qh
@@ -146,27 +146,24 @@ void IL_REMOVE(IntrusiveList this, entity it)
  */
 #define IL_CLEAR(this) \
        MACRO_BEGIN \
-       { \
                IntrusiveList __il = this; \
                assert(__il); \
                .entity il_prev = __il.il_prevfld; \
                IL_EACH(__il, true, it.(il_next) = it.(il_prev) = NULL); \
                __il.il_head = __il.il_tail = NULL; \
-       } MACRO_END
+       MACRO_END
 
 /**
  * Delete the list
  */
 #define IL_DELETE(this) \
        MACRO_BEGIN \
-       { \
                delete(this); \
                this = NULL; \
-       } MACRO_END
+       MACRO_END
 
 #define IL_EACH(this, cond, body) \
        MACRO_BEGIN \
-       { \
                IntrusiveList _il = this; \
                assert(_il); \
                .entity il_next = _il.il_nextfld; \
@@ -177,7 +174,7 @@ void IL_REMOVE(IntrusiveList this, entity it)
                        _next = it.(il_next); \
                        if (cond) { LAMBDA(body) } \
                } \
-       } MACRO_END
+       MACRO_END
 
 .int il_id;
 IntrusiveList il_links[IL_MAX];
@@ -215,7 +212,7 @@ void IL_INIT(IntrusiveList this)
                        return;
                }
        }
-       LOG_WARNF("IntrusiveList overflow");
+       LOG_WARN("IntrusiveList overflow");
 }
 
 ERASEABLE