tree-wide: Fixes multi-line macro width after replace to __func__

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19861>

diff --git a/src/freedreno/decode/script.c b/src/freedreno/decode/script.c
index 7722417..c2bf75d 100644 (file)
--- a/src/freedreno/decode/script.c
+++ b/src/freedreno/decode/script.c
@@ -46,7 +46,7 @@ static lua_State *L;
 #if 0
 #define DBG(fmt, ...)                                                          \
    do {                                                                        \
-      printf(" ** %s:%d ** " fmt "\n", __func__, __LINE__, ##__VA_ARGS__); \
+      printf(" ** %s:%d ** " fmt "\n", __func__, __LINE__, ##__VA_ARGS__);     \
    } while (0)
 #else
 #define DBG(fmt, ...)                                                          \

diff --git a/src/freedreno/drm/freedreno_priv.h b/src/freedreno/drm/freedreno_priv.h
index 379f649..5191fb3 100644 (file)
--- a/src/freedreno/drm/freedreno_priv.h
+++ b/src/freedreno/drm/freedreno_priv.h
@@ -355,21 +355,21 @@ bool fd_dbg(void);
 #define INFO_MSG(fmt, ...)                                                     \
    do {                                                                        \
       if (fd_dbg())                                                            \
-         mesa_logi("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);      \
+         mesa_logi("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);          \
    } while (0)
 #define DEBUG_MSG(fmt, ...)                                                    \
    do                                                                          \
       if (enable_debug) {                                                      \
-         mesa_logd("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);      \
+         mesa_logd("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);          \
       }                                                                        \
    while (0)
 #define WARN_MSG(fmt, ...)                                                     \
    do {                                                                        \
-      mesa_logw("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);         \
+      mesa_logw("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);             \
    } while (0)
 #define ERROR_MSG(fmt, ...)                                                    \
    do {                                                                        \
-      mesa_loge("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);         \
+      mesa_loge("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);             \
    } while (0)
 
 #define U642VOID(x) ((void *)(unsigned long)(x))

diff --git a/src/freedreno/ir3/ir3_context.h b/src/freedreno/ir3/ir3_context.h
index 4d3e706..0085d8a 100644 (file)
--- a/src/freedreno/ir3/ir3_context.h
+++ b/src/freedreno/ir3/ir3_context.h
@@ -36,7 +36,7 @@
 
 #define DBG(fmt, ...)                                                          \
    do {                                                                        \
-      mesa_logd("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);         \
+      mesa_logd("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);             \
    } while (0)
 
 /**

diff --git a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
index 5ec0fb2..5e626c0 100644 (file)
--- a/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_x86sse.c
@@ -84,7 +84,7 @@ void x86_print_reg( struct x86_reg reg )
 #define DUMP_END() debug_printf( "\n" )
 
 #define DUMP() do {                             \
-   const char *foo = __func__;              \
+   const char *foo = __func__;                  \
    while (*foo && *foo != '_')                  \
       foo++;                                    \
    if  (*foo)                                   \

diff --git a/src/gallium/drivers/etnaviv/etnaviv_debug.h b/src/gallium/drivers/etnaviv/etnaviv_debug.h
index 0bf6418..693c36f 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_debug.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_debug.h
@@ -63,21 +63,21 @@ extern int etna_mesa_debug; /* set in etnaviv_screen.c from ETNA_MESA_DEBUG */
 #define DBG_F(flag, fmt, ...)                             \
    do {                                                   \
       if (etna_mesa_debug & (flag))                       \
-         mesa_logd("%s:%d: " fmt, __func__, __LINE__, \
+         mesa_logd("%s:%d: " fmt, __func__, __LINE__,     \
                    ##__VA_ARGS__);                        \
    } while (0)
 
 #define DBG(fmt, ...)                                     \
    do {                                                   \
       if (etna_mesa_debug & ETNA_DBG_MSGS)                \
-         mesa_logd("%s:%d: " fmt, __func__, __LINE__, \
+         mesa_logd("%s:%d: " fmt, __func__, __LINE__,     \
                    ##__VA_ARGS__);                        \
    } while (0)
 
 /* A serious bug, show this even in non-debug mode */
 #define BUG(fmt, ...)                                                  \
    do {                                                                \
-      mesa_loge("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__); \
+      mesa_loge("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__);     \
    } while (0)
 
 #endif

diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h
index 0aa20a3..5526508 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -115,7 +115,7 @@ extern bool fd_binning_enabled;
    do {                                                                        \
       if (FD_DBG(MSGS))                                                        \
          mesa_logi("%5d: %s:%d: " fmt, ((pid_t)syscall(SYS_gettid)),           \
-                                        __func__, __LINE__,                \
+                                        __func__, __LINE__,                    \
                                         ##__VA_ARGS__);                        \
    } while (0)
 

diff --git a/src/gallium/drivers/llvmpipe/lp_linear_priv.h b/src/gallium/drivers/llvmpipe/lp_linear_priv.h
index d23bab9..66672ee 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_linear_priv.h
+++ b/src/gallium/drivers/llvmpipe/lp_linear_priv.h
@@ -164,7 +164,7 @@ lp_linear_init_noop_sampler(struct lp_linear_sampler *samp);
 
 #define FAIL(s) do {                                    \
       if (LP_DEBUG & DEBUG_LINEAR)                      \
-         debug_printf("%s: %s\n", __func__, s);     \
+         debug_printf("%s: %s\n", __func__, s);         \
       return FALSE;                                     \
 } while (0)