tracing: Use ? : shortcut in trace macros

Instead of having:

  #define __assign_str(dst, src)					\
	memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ?		\
		__data_offsets.dst##_ptr_ : "(null)",			\
		__get_dynamic_array_len(dst))

Use the ? : shortcut and compact it down to:

  #define __assign_str(dst, src)					\
	memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)",	\
	       __get_dynamic_array_len(dst))

Link: https://lore.kernel.org/linux-trace-kernel/[email protected]
Cc: Masami Hiramatsu <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Rodrigo Vivi <[email protected]>
Cc: Chuck Lever <[email protected]>
Suggested-by: Mathieu Desnoyers <[email protected]>
Signed-off-by: Steven Rostedt (Google) <[email protected]>

diff --git a/include/trace/stages/stage5_get_offsets.h b/include/trace/stages/stage5_get_offsets.h
index 45f8151cf6221d352c1993bdfbd2ed5882d9e05f..20b801ed3fd44567d7e95745d952e6975647fde3 100644 (file)
--- a/include/trace/stages/stage5_get_offsets.h
+++ b/include/trace/stages/stage5_get_offsets.h
@@ -47,7 +47,7 @@
 
 #undef __string
 #define __string(item, src) __dynamic_array(char, item,                        \
-                   strlen((src) ? (const char *)(src) : "(null)") + 1) \
+                   strlen((const char *)(src) ? : "(null)") + 1)       \
        __data_offsets->item##_ptr_ = src;
 
 #undef __string_len
@@ -70,7 +70,7 @@
 
 #undef __rel_string
 #define __rel_string(item, src) __rel_dynamic_array(char, item,                \
-                   strlen((src) ? (const char *)(src) : "(null)") + 1) \
+                   strlen((const char *)(src) ? : "(null)") + 1)       \
        __data_offsets->item##_ptr_ = src;
 
 #undef __rel_string_len

diff --git a/include/trace/stages/stage6_event_callback.h b/include/trace/stages/stage6_event_callback.h
index c0e5d097324e7436fbf97e1cb9626a798b43d365..38732855eadb8182215359670e516dfd900a2019 100644 (file)
--- a/include/trace/stages/stage6_event_callback.h
+++ b/include/trace/stages/stage6_event_callback.h
@@ -32,15 +32,14 @@
 
 #undef __assign_str
 #define __assign_str(dst, src)                                         \
-       memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ?              \
-              __data_offsets.dst##_ptr_ : "(null)",                    \
+       memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ? : "(null)",  \
               __get_dynamic_array_len(dst))
 
 #undef __assign_str_len
 #define __assign_str_len(dst, src, len)                                        \
        do {                                                            \
-               memcpy(__get_str(dst), __data_offsets.dst##_ptr_ ?      \
-                      __data_offsets.dst##_ptr_ : "(null)", len);      \
+               memcpy(__get_str(dst),                                  \
+                      __data_offsets.dst##_ptr_ ? : "(null)", len);    \
                __get_str(dst)[len] = '\0';                             \
        } while(0)
 
@@ -95,15 +94,14 @@
 
 #undef __assign_rel_str
 #define __assign_rel_str(dst, src)                                     \
-       memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ?          \
-              __data_offsets.dst##_ptr_ : "(null)",                    \
+       memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ? : "(null)", \
               __get_rel_dynamic_array_len(dst))
 
 #undef __assign_rel_str_len
 #define __assign_rel_str_len(dst, src, len)                            \
        do {                                                            \
-               memcpy(__get_rel_str(dst), __data_offsets.dst##_ptr_ ?  \
-                      __data_offsets.dst##_ptr_ : "(null)", len);      \
+               memcpy(__get_rel_str(dst),                              \
+                      __data_offsets.dst##_ptr_ ? : "(null)", len);    \
                __get_rel_str(dst)[len] = '\0';                         \
        } while (0)