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 <francis.deslauriers@efficios.com>
Change-Id: I5afd805506beb91512cb855566c475d03ed333f6
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3615
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c
index fd47e3dfc80cad57c270563bbb6e45e654370383..9f564fff772a2e2a49ed912a892b6d119ba5d8b3 100644 (file)
--- 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 0bb84b085a77d480040848984ce2bafee6c6edab..5d544ecf5d29b91669b0b74bf9fb68ba5e0c63e7 100644 (file)
--- 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(