[18/41] libmultipath: rename __snprint_config()

Commit Message

Martin Wilck Aug. 8, 2024, 3:25 p.m. UTC

Signed-off-by: Martin Wilck <[e-mail]>
---
 libmultipath/libmultipath.version | 10 +++-------
 libmultipath/print.c              |  4 ++--
 libmultipath/print.h              |  2 +-
 multipathd/cli_handlers.c         |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

Patch

diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version
index 0ec4527..e6c6daf 100644
--- a/libmultipath/libmultipath.version
+++ b/libmultipath/libmultipath.version
@@ -43,7 +43,7 @@  LIBMPATHCOMMON_1.0.0 {
 	put_multipath_config;
 };
 
-LIBMULTIPATH_25.0.0 {
+LIBMULTIPATH_26.0.0 {
 global:
 	/* symbols referenced by multipath and multipathd */
 	add_foreign;
@@ -74,6 +74,7 @@  global:
 	dm_cancel_deferred_remove;
 	dm_enablegroup;
 	dm_fail_path;
+	dm_find_map_by_wwid;
 	_dm_flush_map;
 	dm_flush_map_nopaths;
 	dm_flush_maps;
@@ -172,7 +173,7 @@  global:
 	should_multipath;
 	skip_libmp_dm_init;
 	snprint_blacklist_report;
-	__snprint_config;
+	snprint_config__;
 	snprint_config;
 	snprint_devices;
 	snprint_foreign_multipaths;
@@ -241,8 +242,3 @@  global:
 local:
 	*;
 };
-
-LIBMULTIPATH_25.1.0 {
-global:
-	dm_find_map_by_wwid;
-} LIBMULTIPATH_25.0.0;
diff --git a/libmultipath/print.c b/libmultipath/print.c
index db0aa35..b911802 100644
--- a/libmultipath/print.c
+++ b/libmultipath/print.c
@@ -1908,7 +1908,7 @@  static int snprint_blacklist_except(const struct config *conf,
 	return get_strbuf_len(buff) - initial_len;
 }
 
-int __snprint_config(const struct config *conf, struct strbuf *buff,
+int snprint_config__(const struct config *conf, struct strbuf *buff,
 		     const struct _vector *hwtable, const struct _vector *mpvec)
 {
 	int rc;
@@ -1934,7 +1934,7 @@  char *snprint_config(const struct config *conf, int *len,
 {
 	STRBUF_ON_STACK(buff);
 	char *reply;
-	int rc = __snprint_config(conf, &buff, hwtable, mpvec);
+	int rc = snprint_config__(conf, &buff, hwtable, mpvec);
 
 	if (rc < 0)
 		return NULL;
diff --git a/libmultipath/print.h b/libmultipath/print.h
index eb4cbc2..4dd2ef2 100644
--- a/libmultipath/print.h
+++ b/libmultipath/print.h
@@ -40,7 +40,7 @@  int _snprint_multipath_topology (const struct gen_multipath *, struct strbuf *,
 #define snprint_multipath_topology(buf, mpp, v, w)			\
 	_snprint_multipath_topology (dm_multipath_to_gen(mpp), buf, v, w)
 int snprint_multipath_topology_json(struct strbuf *, const struct vectors *vecs);
-int __snprint_config(const struct config *conf, struct strbuf *buff,
+int snprint_config__(const struct config *conf, struct strbuf *buff,
 		     const struct _vector *hwtable, const struct _vector *mpvec);
 char *snprint_config(const struct config *conf, int *len,
 		     const struct _vector *hwtable,
diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
index ef5f53e..2efe23f 100644
--- a/multipathd/cli_handlers.c
+++ b/multipathd/cli_handlers.c
@@ -165,7 +165,7 @@  show_config (struct strbuf *reply, const struct _vector *hwtable,
 
 	conf = get_multipath_config();
 	pthread_cleanup_push(put_multipath_config, conf);
-	rc = __snprint_config(conf, reply, hwtable, mpvec);
+	rc = snprint_config__(conf, reply, hwtable, mpvec);
 	pthread_cleanup_pop(1);
 	if (rc < 0)
 		return 1;