From: Francis Deslauriers Date: Thu, 4 Jun 2020 19:13:34 +0000 (-0400) Subject: Cleanup: debug-info: move all `_FIELD_NAME` defines to the same file X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=a7dd8d86d05ad9bc62cde226273d5927f80f6268 Cleanup: debug-info: move all `_FIELD_NAME` defines to the same file The `VPID_FIELD_NAME` and `IP_FIELD_NAME` are currently defined in both `debug_info.c` and `debug-info.h`. This commit regroups all `_FIELD_NAME` defines to the same file for consistency. Signed-off-by: Francis Deslauriers Change-Id: I5afd805506beb91512cb855566c475d03ed333f6 Reviewed-on: https://review.lttng.org/c/babeltrace/+/3615 Tested-by: jenkins Reviewed-by: Philippe Proulx --- diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c index fd47e3df..9f564fff 100644 --- a/src/plugins/lttng-utils/debug-info/debug-info.c +++ b/src/plugins/lttng-utils/debug-info/debug-info.c @@ -33,15 +33,6 @@ #define DEFAULT_DEBUG_INFO_FIELD_NAME "debug_info" #define LTTNG_UST_STATEDUMP_PREFIX "lttng_ust" -#define VPID_FIELD_NAME "vpid" -#define IP_FIELD_NAME "ip" -#define BADDR_FIELD_NAME "baddr" -#define CRC32_FIELD_NAME "crc" -#define BUILD_ID_FIELD_NAME "build_id" -#define FILENAME_FIELD_NAME "filename" -#define IS_PIC_FIELD_NAME "is_pic" -#define MEMSZ_FIELD_NAME "memsz" -#define PATH_FIELD_NAME "path" struct debug_info_component { bt_logging_level log_level; diff --git a/src/plugins/lttng-utils/debug-info/debug-info.h b/src/plugins/lttng-utils/debug-info/debug-info.h index 0bb84b08..5d544ecf 100644 --- a/src/plugins/lttng-utils/debug-info/debug-info.h +++ b/src/plugins/lttng-utils/debug-info/debug-info.h @@ -18,8 +18,15 @@ #include "common/macros.h" -#define VPID_FIELD_NAME "vpid" -#define IP_FIELD_NAME "ip" +#define VPID_FIELD_NAME "vpid" +#define IP_FIELD_NAME "ip" +#define BADDR_FIELD_NAME "baddr" +#define CRC32_FIELD_NAME "crc" +#define BUILD_ID_FIELD_NAME "build_id" +#define FILENAME_FIELD_NAME "filename" +#define IS_PIC_FIELD_NAME "is_pic" +#define MEMSZ_FIELD_NAME "memsz" +#define PATH_FIELD_NAME "path" BT_HIDDEN bt_component_class_initialize_method_status debug_info_comp_init(