diff mbox series

[35/41] libdmmp: rename enum values and variables starting with _DMMP_

Message ID 20240808152620.93965-36-mwilck@suse.com (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show
Series multipath-tools: comply with C library reserved names | expand

Commit Message

Martin Wilck Aug. 8, 2024, 3:26 p.m. UTC 
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 libdmmp/libdmmp_path.c | 14 +++++++-------
 libdmmp/libdmmp_pg.c   | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)
diff mbox series

Patch

diff --git a/libdmmp/libdmmp_path.c b/libdmmp/libdmmp_path.c
index 21714b1..0650f8d 100644
--- a/libdmmp/libdmmp_path.c
+++ b/libdmmp/libdmmp_path.c
@@ -27,17 +27,17 @@ 
 #include "libdmmp/libdmmp.h"
 #include "libdmmp_private.h"
 
-#define _DMMP_SHOW_PS_INDEX_BLK_NAME	0
-#define _DMMP_SHOW_PS_INDEX_STATUS	1
-#define _DMMP_SHOW_PS_INDEX_WWID	2
-#define _DMMP_SHOW_PS_INDEX_PGID	3
+#define DMMP_SHOW_PS_INDEX_BLK_NAME	0
+#define DMMP_SHOW_PS_INDEX_STATUS	1
+#define DMMP_SHOW_PS_INDEX_WWID	2
+#define DMMP_SHOW_PS_INDEX_PGID	3
 
 struct dmmp_path {
 	char *blk_name;
 	uint32_t status;
 };
 
-static const struct _num_str_conv _DMMP_PATH_STATUS_CONV[] = {
+static const struct _num_str_conv DMMP_PATH_STATUS_CONV[] = {
 	{DMMP_PATH_STATUS_UNKNOWN, "undef"},
 	{DMMP_PATH_STATUS_UP, "ready"},
 	{DMMP_PATH_STATUS_DOWN, "faulty"},
@@ -49,10 +49,10 @@  static const struct _num_str_conv _DMMP_PATH_STATUS_CONV[] = {
 };
 
 _dmmp_str_func_gen(dmmp_path_status_str, uint32_t, path_status,
-		   _DMMP_PATH_STATUS_CONV);
+		   DMMP_PATH_STATUS_CONV);
 _dmmp_str_conv_func_gen(_dmmp_path_status_str_conv, ctx, path_status_str,
 			uint32_t, DMMP_PATH_STATUS_UNKNOWN,
-			_DMMP_PATH_STATUS_CONV);
+			DMMP_PATH_STATUS_CONV);
 
 _dmmp_getter_func_gen(dmmp_path_blk_name_get, struct dmmp_path, dmmp_p,
 		      blk_name, const char *);
diff --git a/libdmmp/libdmmp_pg.c b/libdmmp/libdmmp_pg.c
index 6be2316..42e87fe 100644
--- a/libdmmp/libdmmp_pg.c
+++ b/libdmmp/libdmmp_pg.c
@@ -28,12 +28,12 @@ 
 #include "libdmmp/libdmmp.h"
 #include "libdmmp_private.h"
 
-#define _DMMP_SHOW_PGS_CMD "show groups raw format %w|%g|%p|%t|%s"
-#define _DMMP_SHOW_PG_INDEX_WWID	0
-#define _DMMP_SHOW_PG_INDEX_PG_ID	1
-#define _DMMP_SHOW_PG_INDEX_PRI		2
-#define _DMMP_SHOW_PG_INDEX_STATUS	3
-#define _DMMP_SHOW_PG_INDEX_SELECTOR	4
+#define DMMP_SHOW_PGS_CMD "show groups raw format %w|%g|%p|%t|%s"
+#define DMMP_SHOW_PG_INDEX_WWID	0
+#define DMMP_SHOW_PG_INDEX_PG_ID	1
+#define DMMP_SHOW_PG_INDEX_PRI		2
+#define DMMP_SHOW_PG_INDEX_STATUS	3
+#define DMMP_SHOW_PG_INDEX_SELECTOR	4
 
 struct dmmp_path_group {
 	uint32_t id;
@@ -45,7 +45,7 @@  struct dmmp_path_group {
 	struct dmmp_path **dmmp_ps;
 };
 
-static const struct _num_str_conv _DMMP_PATH_GROUP_STATUS_CONV[] = {
+static const struct _num_str_conv DMMP_PATH_GROUP_STATUS_CONV[] = {
 	{DMMP_PATH_GROUP_STATUS_UNKNOWN, "undef"},
 	{DMMP_PATH_GROUP_STATUS_ACTIVE, "active"},
 	{DMMP_PATH_GROUP_STATUS_DISABLED, "disabled"},
@@ -53,10 +53,10 @@  static const struct _num_str_conv _DMMP_PATH_GROUP_STATUS_CONV[] = {
 };
 
 _dmmp_str_func_gen(dmmp_path_group_status_str, uint32_t, pg_status,
-		   _DMMP_PATH_GROUP_STATUS_CONV);
+		   DMMP_PATH_GROUP_STATUS_CONV);
 _dmmp_str_conv_func_gen(_dmmp_path_group_status_str_conv, ctx, pg_status_str,
 			uint32_t, DMMP_PATH_GROUP_STATUS_UNKNOWN,
-			_DMMP_PATH_GROUP_STATUS_CONV);
+			DMMP_PATH_GROUP_STATUS_CONV);
 
 _dmmp_getter_func_gen(dmmp_path_group_id_get, struct dmmp_path_group, dmmp_pg,
 		      id, uint32_t);