[30/41] libmultipath: rename symbols starting with underscore in print.h

Message ID	20240808152620.93965-31-mwilck@suse.com (mailing list archive)
State	Not Applicable, archived
Delegated to:	christophe varoqui
Headers	show Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA27119047B for <dm-devel@lists.linux.dev>; Thu, 8 Aug 2024 15:27:06 +0000 (UTC) From: Martin Wilck <martin.wilck@suse.com> To: Christophe Varoqui <christophe.varoqui@opensvc.com>, Benjamin Marzinski <bmarzins@redhat.com> Cc: dm-devel@lists.linux.dev Subject: [PATCH 30/41] libmultipath: rename symbols starting with underscore in print.h Date: Thu, 8 Aug 2024 17:26:09 +0200 Message-ID: <20240808152620.93965-31-mwilck@suse.com> In-Reply-To: <20240808152620.93965-1-mwilck@suse.com> References: <20240808152620.93965-1-mwilck@suse.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	multipath-tools: comply with C library reserved names \| expand [00/41] multipath-tools: comply with C library reserved names [01/41] multipath-tools tests: make alias.test succeed with increased verbosity [02/41] libmpathutil: avoid extra memory allocation in print_strbuf() [03/41] libmpathutil: rename strlcat and strlcpy [04/41] libmpathutil.version: remove strlcpy and strlcat, and LIBMULTIPATH section [05/41] libmpathutil: fix __attribute typo in log_pthread.c [06/41] libmultipath: devmapper.c: rename __DR_UNUSED__, and fix __attribute typo [07/41] multipathd: fix __attribute typo [08/41] multipath-tools: use common convention for "header file included" macros [09/41] libmpathcmd: rename __mpath_connect() to mpath_connect__() [10/41] libmpathutil: rename _MAX_CMD_LEN [11/41] libmpathutil: rename __append_strbuf_str() and __get_strbuf_buf() [12/41] libmpathutil: rename _log_bitfield_overflow() [13/41] libmpathutil: rename _install_keyword() to install_keyword__() [14/41] libmultipath: rename _NVME_LIB_C [15/41] libmultipath: checkers.h: fix __CHECKER_FIRST_MSG in comment [16/41] libmultipath: rename identifiers with leading underscores in devmapper.h [17/41] libmultipath: rename identifiers with leading underscores in discovery.h [18/41] libmultipath: rename __snprint_config() [19/41] libmultipath: rename __unlock() [20/41] libmultipath: rename __sysfs_attr_get_value() [21/41] libmultipath: rename __snprint_foreign_topology() [22/41] libmultipath: rename macros with double underscores in propsel.c [23/41] libmultipath: rename enum values with double underscores in structs.h [24/41] libmultipath: rename macros starting with underscore [25/41] libmultipath: rename __internal_config variable [26/41] libmultipath: rename _dm_flush_map() to dm_flush_map__() [27/41] libmultipath: foreign: rename _check() to check__() [28/41] libmultipath: rename _cleanup_foreign() [29/41] libmultipath: rename _init_config() [30/41] libmultipath: rename symbols starting with underscore in print.h [31/41] libmultipath: remove dead code in pgpolicies.h [32/41] libmultipath: remove struct and union names in cciss.h [33/41] libmpathpersist: rename functions with double leading underscore [34/41] libdmmp: rename macros starting with _DMMP [35/41] libdmmp: rename enum values and variables starting with _DMMP_ [36/41] libdmmp: rename non-static functions starting with underscore [37/41] multipathd: rename symbols with double leading underscore [38/41] multipath-tools tests: rename functions with double underscores [39/41] kpartx: rename macros with leading underscores [40/41] libmpathutil: rename struct _vector to vector_s [41/41] libmultipath: don't define __user

diff --git a/libmultipath/foreign.c b/libmultipath/foreign.c index 5ec2d0b..d23439e 100644 --- a/libmultipath/foreign.c +++ b/libmultipath/foreign.c @@ -458,7 +458,7 @@ void foreign_path_layout(fieldwidth_t *width) vec = fgn->get_paths(fgn->context); if (vec != NULL) { - _get_path_layout(vec, LAYOUT_RESET_NOT, width); + get_path_layout__(vec, LAYOUT_RESET_NOT, width); } fgn->release_paths(fgn->context, vec); @@ -489,7 +489,7 @@ void foreign_multipath_layout(fieldwidth_t *width) vec = fgn->get_multipaths(fgn->context); if (vec != NULL) { - _get_multipath_layout(vec, LAYOUT_RESET_NOT, width); + get_multipath_layout__(vec, LAYOUT_RESET_NOT, width); } fgn->release_multipaths(fgn->context, vec); @@ -517,7 +517,7 @@ static int snprint_foreign_topology__(struct strbuf *buf, int verbosity, vec = fgn->get_multipaths(fgn->context); if (vec != NULL) { vector_foreach_slot(vec, gm, j) { - if (_snprint_multipath_topology( + if (snprint_multipath_topology__( gm, buf, verbosity, width) < 0) break; } @@ -566,7 +566,7 @@ void print_foreign_topology(int verbosity) fgn->lock(fgn->context); pthread_cleanup_push(fgn->unlock, fgn->context); vec = fgn->get_paths(fgn->context); - _get_multipath_layout(vec, LAYOUT_RESET_NOT, width); + get_multipath_layout__(vec, LAYOUT_RESET_NOT, width); fgn->release_paths(fgn->context, vec); pthread_cleanup_pop(1); } @@ -600,7 +600,7 @@ int snprint_foreign_paths(struct strbuf *buf, const char *style, vec = fgn->get_paths(fgn->context); if (vec != NULL) { vector_foreach_slot(vec, gp, j) { - ret = _snprint_path(gp, buf, style, width); + ret = snprint_path__(gp, buf, style, width); if (ret < 0) break; } @@ -640,7 +640,7 @@ int snprint_foreign_multipaths(struct strbuf *buf, const char *style, vec = fgn->get_multipaths(fgn->context); if (vec != NULL) { vector_foreach_slot(vec, gm, j) { - ret = _snprint_multipath(gm, buf, + ret = snprint_multipath__(gm, buf, style, width); if (ret < 0) break; diff --git a/libmultipath/foreign.h b/libmultipath/foreign.h index f3bc1b2..809824d 100644 --- a/libmultipath/foreign.h +++ b/libmultipath/foreign.h @@ -271,7 +271,7 @@ void foreign_multipath_layout(fieldwidth_t *width); * '\0' - terminated. * @param buf: output buffer * @param verbosity: verbosity level - * @param width: an array of field widths, initialized by _get_path_layout() + * @param width: an array of field widths, initialized by get_path_layout__() * @returns: number of printed characters excluding trailing '\0'. */ int snprint_foreign_topology(struct strbuf *buf, int verbosity, diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version index f92f759..21d48da 100644 --- a/libmultipath/libmultipath.version +++ b/libmultipath/libmultipath.version @@ -149,7 +149,7 @@ global: path_offline; print_all_paths; print_foreign_topology; - _print_multipath_topology; + print_multipath_topology__; reinstate_paths; remember_wwid; remove_feature; @@ -179,12 +179,12 @@ global: snprint_foreign_multipaths; snprint_foreign_paths; snprint_foreign_topology; - _snprint_multipath; + snprint_multipath__; snprint_multipath_header; snprint_multipath_map_json; - _snprint_multipath_topology; + snprint_multipath_topology__; snprint_multipath_topology_json; - _snprint_path; + snprint_path__; snprint_path_header; snprint_status; snprint_wildcards; diff --git a/libmultipath/print.c b/libmultipath/print.c index b8868ea..190c823 100644 --- a/libmultipath/print.c +++ b/libmultipath/print.c @@ -924,7 +924,7 @@ void get_path_layout(vector pathvec, int header, fieldwidth_t *width) { vector gpvec = vector_convert(NULL, pathvec, struct path, dm_path_to_gen); - _get_path_layout(gpvec, + get_path_layout__(gpvec, header ? LAYOUT_RESET_HEADER : LAYOUT_RESET_ZERO, width); vector_free(gpvec); @@ -946,7 +946,7 @@ reset_width(fieldwidth_t *width, enum layout_reset reset, const char *header) } } -void _get_path_layout (const struct _vector *gpvec, enum layout_reset reset, +void get_path_layout__ (const struct _vector *gpvec, enum layout_reset reset, fieldwidth_t *width) { unsigned int i, j; @@ -980,14 +980,14 @@ fieldwidth_t *alloc_multipath_layout(void) { void get_multipath_layout (vector mpvec, int header, fieldwidth_t *width) { vector gmvec = vector_convert(NULL, mpvec, struct multipath, dm_multipath_to_gen); - _get_multipath_layout(gmvec, + get_multipath_layout__(gmvec, header ? LAYOUT_RESET_HEADER : LAYOUT_RESET_ZERO, width); vector_free(gmvec); } void -_get_multipath_layout (const struct _vector *gmvec, enum layout_reset reset, +get_multipath_layout__ (const struct _vector *gmvec, enum layout_reset reset, fieldwidth_t *width) { unsigned int i, j; @@ -1110,7 +1110,7 @@ int snprint_multipath_header(struct strbuf *line, const char *format, return get_strbuf_len(line) - initial_len; } -int _snprint_multipath(const struct gen_multipath *gmp, +int snprint_multipath__(const struct gen_multipath *gmp, struct strbuf *line, const char *format, const fieldwidth_t *width) { @@ -1171,7 +1171,7 @@ int snprint_path_header(struct strbuf *line, const char *format, return get_strbuf_len(line) - initial_len; } -int _snprint_path(const struct gen_path *gp, struct strbuf *line, +int snprint_path__(const struct gen_path *gp, struct strbuf *line, const char *format, const fieldwidth_t *width) { int initial_len = get_strbuf_len(line); @@ -1200,7 +1200,7 @@ int _snprint_path(const struct gen_path *gp, struct strbuf *line, return get_strbuf_len(line) - initial_len; } -int _snprint_pathgroup(const struct gen_pathgroup *ggp, struct strbuf *line, +int snprint_pathgroup__(const struct gen_pathgroup *ggp, struct strbuf *line, const char *format) { int initial_len = get_strbuf_len(line); @@ -1223,9 +1223,9 @@ int _snprint_pathgroup(const struct gen_pathgroup *ggp, struct strbuf *line, } #define snprint_pathgroup(line, fmt, pgp) \ - _snprint_pathgroup(dm_pathgroup_to_gen(pgp), line, fmt) + snprint_pathgroup__(dm_pathgroup_to_gen(pgp), line, fmt) -void _print_multipath_topology(const struct gen_multipath *gmp, int verbosity) +void print_multipath_topology__(const struct gen_multipath *gmp, int verbosity) { STRBUF_ON_STACK(buff); fieldwidth_t *p_width __attribute__((cleanup(cleanup_ucharp))) = NULL; @@ -1241,13 +1241,13 @@ void _print_multipath_topology(const struct gen_multipath *gmp, int verbosity) pathvec = gpg->ops->get_paths(gpg); if (pathvec == NULL) continue; - _get_path_layout(pathvec, LAYOUT_RESET_NOT, p_width); + get_path_layout__(pathvec, LAYOUT_RESET_NOT, p_width); gpg->ops->rel_paths(gpg, pathvec); } gmp->ops->rel_pathgroups(gmp, pgvec); } - _snprint_multipath_topology(gmp, &buff, verbosity, p_width); + snprint_multipath_topology__(gmp, &buff, verbosity, p_width); printf("%s", get_strbuf_str(&buff)); } @@ -1266,7 +1266,7 @@ int snprint_multipath_style(const struct gen_multipath *gmp, need_wwid ? " (%w)" : "", " %d %s"); } -int _snprint_multipath_topology(const struct gen_multipath *gmp, +int snprint_multipath_topology__(const struct gen_multipath *gmp, struct strbuf *buff, int verbosity, const fieldwidth_t *p_width) { @@ -1284,7 +1284,7 @@ int _snprint_multipath_topology(const struct gen_multipath *gmp, return -ENOMEM; if (verbosity == 1) - return _snprint_multipath(gmp, buff, "%n", width); + return snprint_multipath__(gmp, buff, "%n", width); if(isatty(1) && (rc = print_strbuf(&style, "%c[%dm", 0x1B, 1)) < 0) /* bold on */ @@ -1295,8 +1295,8 @@ int _snprint_multipath_topology(const struct gen_multipath *gmp, (rc = print_strbuf(&style, "%c[%dm", 0x1B, 0)) < 0) /* bold off */ return rc; - if ((rc = _snprint_multipath(gmp, buff, get_strbuf_str(&style), width)) < 0 - || (rc = _snprint_multipath(gmp, buff, PRINT_MAP_PROPS, width)) < 0) + if ((rc = snprint_multipath__(gmp, buff, get_strbuf_str(&style), width)) < 0 + || (rc = snprint_multipath__(gmp, buff, PRINT_MAP_PROPS, width)) < 0) return rc; pgvec = gmp->ops->get_pathgroups(gmp); @@ -1310,7 +1310,7 @@ int _snprint_multipath_topology(const struct gen_multipath *gmp, if ((rc = print_strbuf(buff, "%c-+- ", last_group ? '`' : '|')) < 0 || - (rc = _snprint_pathgroup(gpg, buff, PRINT_PG_INDENT)) < 0) + (rc = snprint_pathgroup__(gpg, buff, PRINT_PG_INDENT)) < 0) return rc; pathvec = gpg->ops->get_paths(gpg); @@ -1322,7 +1322,7 @@ int _snprint_multipath_topology(const struct gen_multipath *gmp, last_group ? ' ' : '|', i + 1 == VECTOR_SIZE(pathvec) ? '`': '|')) < 0 || - (rc = _snprint_path(gp, buff, + (rc = snprint_path__(gp, buff, PRINT_PATH_INDENT, p_width)) < 0) return rc; } diff --git a/libmultipath/print.h b/libmultipath/print.h index 4dd2ef2..9c2aea4 100644 --- a/libmultipath/print.h +++ b/libmultipath/print.h @@ -17,28 +17,28 @@ enum layout_reset { /* fieldwidth_t is defined in generic.h */ fieldwidth_t *alloc_path_layout(void); -void _get_path_layout (const struct _vector *gpvec, enum layout_reset, +void get_path_layout__ (const struct _vector *gpvec, enum layout_reset, fieldwidth_t *width); void get_path_layout (vector pathvec, int header, fieldwidth_t *width); fieldwidth_t *alloc_multipath_layout(void); -void _get_multipath_layout (const struct _vector *gmvec, enum layout_reset, +void get_multipath_layout__ (const struct _vector *gmvec, enum layout_reset, fieldwidth_t *width); void get_multipath_layout (vector mpvec, int header, fieldwidth_t *width); int snprint_path_header(struct strbuf *, const char *, const fieldwidth_t *); int snprint_multipath_header(struct strbuf *, const char *, const fieldwidth_t *); -int _snprint_path (const struct gen_path *, struct strbuf *, const char *, +int snprint_path__ (const struct gen_path *, struct strbuf *, const char *, const fieldwidth_t *); #define snprint_path(buf, fmt, pp, w) \ - _snprint_path(dm_path_to_gen(pp), buf, fmt, w) -int _snprint_multipath (const struct gen_multipath *, struct strbuf *, + snprint_path__(dm_path_to_gen(pp), buf, fmt, w) +int snprint_multipath__ (const struct gen_multipath *, struct strbuf *, const char *, const fieldwidth_t *); #define snprint_multipath(buf, fmt, mp, w) \ - _snprint_multipath(dm_multipath_to_gen(mp), buf, fmt, w) -int _snprint_multipath_topology (const struct gen_multipath *, struct strbuf *, + snprint_multipath__(dm_multipath_to_gen(mp), buf, fmt, w) +int snprint_multipath_topology__ (const struct gen_multipath *, struct strbuf *, int verbosity, const fieldwidth_t *); #define snprint_multipath_topology(buf, mpp, v, w) \ - _snprint_multipath_topology (dm_multipath_to_gen(mpp), buf, 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, const struct _vector *hwtable, const struct _vector *mpvec); @@ -58,10 +58,10 @@ int snprint_tgt_wwpn(struct strbuf *, const struct path *); #define PROTOCOL_BUF_SIZE sizeof("scsi:unspec") int snprint_path_protocol(struct strbuf *, const struct path *); -void _print_multipath_topology (const struct gen_multipath * gmp, +void print_multipath_topology__ (const struct gen_multipath * gmp, int verbosity); #define print_multipath_topology(mpp, v) \ - _print_multipath_topology(dm_multipath_to_gen(mpp), v) + print_multipath_topology__(dm_multipath_to_gen(mpp), v) void print_all_paths (vector pathvec, int banner);

[30/41] libmultipath: rename symbols starting with underscore in print.h

Commit Message

Patch