[36/41] libdmmp: rename non-static functions starting with underscore

Message ID	20240808152620.93965-37-mwilck@suse.com (mailing list archive)
State	Not Applicable, archived
Delegated to:	christophe varoqui
Headers	show Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (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 11363190675 for <dm-devel@lists.linux.dev>; Thu, 8 Aug 2024 15:27:12 +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 36/41] libdmmp: rename non-static functions starting with underscore Date: Thu, 8 Aug 2024 17:26:15 +0200 Message-ID: <20240808152620.93965-37-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/libdmmp/libdmmp.c b/libdmmp/libdmmp.c index 47f5b53..8b9686a 100644 --- a/libdmmp/libdmmp.c +++ b/libdmmp/libdmmp.c @@ -86,9 +86,9 @@ _dmmp_getter_func_gen(dmmp_last_error_msg, struct dmmp_context, ctx, last_err_msg, const char *); _dmmp_array_free_func_gen(dmmp_mpath_array_free, struct dmmp_mpath, - _dmmp_mpath_free); + dmmp_mpath_free); -void _dmmp_log(struct dmmp_context *ctx, int priority, const char *file, +void dmmp_log(struct dmmp_context *ctx, int priority, const char *file, int line, const char *func_name, const char *format, ...) { va_list args; @@ -113,7 +113,7 @@ struct dmmp_context *dmmp_context_new(void) if (ctx == NULL) return NULL; - ctx->log_func = _dmmp_log_stderr; + ctx->log_func = dmmp_log_stderr; ctx->log_priority = DMMP_LOG_PRIORITY_DEFAULT; ctx->userdata = NULL; ctx->tmo = DEFAULT_UXSOCK_TIMEOUT; @@ -250,10 +250,10 @@ int dmmp_mpath_array_get(struct dmmp_context *ctx, goto out; } - dmmp_mp = _dmmp_mpath_new(); + dmmp_mp = dmmp_mpath_new(); _dmmp_alloc_null_check(ctx, dmmp_mp, rc, out); (*dmmp_mps)[i] = dmmp_mp; - _good(_dmmp_mpath_update(ctx, dmmp_mp, j_obj_map), rc, out); + _good(dmmp_mpath_update(ctx, dmmp_mp, j_obj_map), rc, out); } out: diff --git a/libdmmp/libdmmp_misc.c b/libdmmp/libdmmp_misc.c index 51c71cd..92bbf8d 100644 --- a/libdmmp/libdmmp_misc.c +++ b/libdmmp/libdmmp_misc.c @@ -31,7 +31,7 @@ #include "libdmmp_private.h" #define DMMP_LOG_STRERR_ALIGN_WIDTH 80 -/* ^ Only used in _dmmp_log_stderr() for pretty log output. +/* ^ Only used in dmmp_log_stderr() for pretty log output. * When provided log message is less than 80 bytes, fill it with space, then * print code file name, function name, line after the 80th bytes. */ @@ -62,7 +62,7 @@ static const struct _num_str_conv _DMMP_PRI_CONV[] = { }; _dmmp_str_func_gen(dmmp_log_priority_str, int, priority, _DMMP_PRI_CONV); -void _dmmp_log_stderr(struct dmmp_context *ctx, int priority, +void dmmp_log_stderr(struct dmmp_context *ctx, int priority, const char *file, int line, const char *func_name, const char *format, va_list args) { diff --git a/libdmmp/libdmmp_mp.c b/libdmmp/libdmmp_mp.c index bc48d0e..1be8ba1 100644 --- a/libdmmp/libdmmp_mp.c +++ b/libdmmp/libdmmp_mp.c @@ -44,7 +44,7 @@ _dmmp_getter_func_gen(dmmp_mpath_wwid_get, struct dmmp_mpath, dmmp_mp, _dmmp_getter_func_gen(dmmp_mpath_kdev_name_get, struct dmmp_mpath, dmmp_mp, kdev_name, const char *); -struct dmmp_mpath *_dmmp_mpath_new(void) +struct dmmp_mpath *dmmp_mpath_new(void) { struct dmmp_mpath *dmmp_mp = NULL; @@ -59,7 +59,7 @@ struct dmmp_mpath *_dmmp_mpath_new(void) return dmmp_mp; } -int _dmmp_mpath_update(struct dmmp_context *ctx, struct dmmp_mpath *dmmp_mp, +int dmmp_mpath_update(struct dmmp_context *ctx, struct dmmp_mpath *dmmp_mp, json_object *j_obj_map) { int rc = DMMP_OK; @@ -113,10 +113,10 @@ int _dmmp_mpath_update(struct dmmp_context *ctx, struct dmmp_mpath *dmmp_mp, dmmp_mp->dmmp_pgs[i] = NULL; for (i = 0; i < dmmp_mp->dmmp_pg_count; ++i) { - dmmp_pg = _dmmp_path_group_new(); + dmmp_pg = dmmp_path_group_new(); _dmmp_alloc_null_check(ctx, dmmp_pg, rc, out); dmmp_mp->dmmp_pgs[i] = dmmp_pg; - _good(_dmmp_path_group_update(ctx, dmmp_pg, + _good(dmmp_path_group_update(ctx, dmmp_pg, array_list_get_idx(ar_pgs, i)), rc, out); } @@ -126,11 +126,11 @@ int _dmmp_mpath_update(struct dmmp_context *ctx, struct dmmp_mpath *dmmp_mp, out: if (rc != DMMP_OK) - _dmmp_mpath_free(dmmp_mp); + dmmp_mpath_free(dmmp_mp); return rc; } -void _dmmp_mpath_free(struct dmmp_mpath *dmmp_mp) +void dmmp_mpath_free(struct dmmp_mpath *dmmp_mp) { if (dmmp_mp == NULL) return ; diff --git a/libdmmp/libdmmp_path.c b/libdmmp/libdmmp_path.c index 0650f8d..96a96f4 100644 --- a/libdmmp/libdmmp_path.c +++ b/libdmmp/libdmmp_path.c @@ -59,7 +59,7 @@ _dmmp_getter_func_gen(dmmp_path_blk_name_get, struct dmmp_path, dmmp_p, _dmmp_getter_func_gen(dmmp_path_status_get, struct dmmp_path, dmmp_p, status, uint32_t); -struct dmmp_path *_dmmp_path_new(void) +struct dmmp_path *dmmp_path_new(void) { struct dmmp_path *dmmp_p = NULL; @@ -72,7 +72,7 @@ struct dmmp_path *_dmmp_path_new(void) return dmmp_p; } -int _dmmp_path_update(struct dmmp_context *ctx, struct dmmp_path *dmmp_p, +int dmmp_path_update(struct dmmp_context *ctx, struct dmmp_path *dmmp_p, json_object *j_obj_p) { int rc = DMMP_OK; @@ -102,11 +102,11 @@ int _dmmp_path_update(struct dmmp_context *ctx, struct dmmp_path *dmmp_p, out: if (rc != DMMP_OK) - _dmmp_path_free(dmmp_p); + dmmp_path_free(dmmp_p); return rc; } -void _dmmp_path_free(struct dmmp_path *dmmp_p) +void dmmp_path_free(struct dmmp_path *dmmp_p) { if (dmmp_p == NULL) return; diff --git a/libdmmp/libdmmp_pg.c b/libdmmp/libdmmp_pg.c index 42e87fe..68f1917 100644 --- a/libdmmp/libdmmp_pg.c +++ b/libdmmp/libdmmp_pg.c @@ -67,10 +67,10 @@ _dmmp_getter_func_gen(dmmp_path_group_priority_get, struct dmmp_path_group, _dmmp_getter_func_gen(dmmp_path_group_selector_get, struct dmmp_path_group, dmmp_pg, selector, const char *); _dmmp_array_free_func_gen(_dmmp_path_group_array_free, struct dmmp_path_group, - _dmmp_path_group_free); + dmmp_path_group_free); -struct dmmp_path_group *_dmmp_path_group_new(void) +struct dmmp_path_group *dmmp_path_group_new(void) { struct dmmp_path_group *dmmp_pg = NULL; @@ -87,7 +87,7 @@ struct dmmp_path_group *_dmmp_path_group_new(void) } return dmmp_pg; } -int _dmmp_path_group_update(struct dmmp_context *ctx, +int dmmp_path_group_update(struct dmmp_context *ctx, struct dmmp_path_group *dmmp_pg, json_object *j_obj_pg) { @@ -157,10 +157,10 @@ int _dmmp_path_group_update(struct dmmp_context *ctx, dmmp_pg->dmmp_ps[i] = NULL; for (i = 0; i < dmmp_pg->dmmp_p_count; ++i) { - dmmp_p = _dmmp_path_new(); + dmmp_p = dmmp_path_new(); _dmmp_alloc_null_check(ctx, dmmp_p, rc, out); dmmp_pg->dmmp_ps[i] = dmmp_p; - _good(_dmmp_path_update(ctx, dmmp_p, + _good(dmmp_path_update(ctx, dmmp_p, array_list_get_idx(ar_ps, i)), rc, out); } @@ -173,11 +173,11 @@ int _dmmp_path_group_update(struct dmmp_context *ctx, out: if (rc != DMMP_OK) - _dmmp_path_group_free(dmmp_pg); + dmmp_path_group_free(dmmp_pg); return rc; } -void _dmmp_path_group_free(struct dmmp_path_group *dmmp_pg) +void dmmp_path_group_free(struct dmmp_path_group *dmmp_pg) { uint32_t i = 0; @@ -188,7 +188,7 @@ void _dmmp_path_group_free(struct dmmp_path_group *dmmp_pg) if (dmmp_pg->dmmp_ps != NULL) { for (i = 0; i < dmmp_pg->dmmp_p_count; ++i) { - _dmmp_path_free(dmmp_pg->dmmp_ps[i]); + dmmp_path_free(dmmp_pg->dmmp_ps[i]); } free(dmmp_pg->dmmp_ps); } diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h index 0c497b3..d154146 100644 --- a/libdmmp/libdmmp_private.h +++ b/libdmmp/libdmmp_private.h @@ -110,33 +110,33 @@ do { \ DMMP_DLL_LOCAL int _dmmp_ipc_exec(struct dmmp_context *ctx, const char *cmd, char **output); -DMMP_DLL_LOCAL struct dmmp_mpath *_dmmp_mpath_new(void); -DMMP_DLL_LOCAL struct dmmp_path_group *_dmmp_path_group_new(void); -DMMP_DLL_LOCAL struct dmmp_path *_dmmp_path_new(void); +DMMP_DLL_LOCAL struct dmmp_mpath *dmmp_mpath_new(void); +DMMP_DLL_LOCAL struct dmmp_path_group *dmmp_path_group_new(void); +DMMP_DLL_LOCAL struct dmmp_path *dmmp_path_new(void); -DMMP_DLL_LOCAL int _dmmp_mpath_update(struct dmmp_context *ctx, +DMMP_DLL_LOCAL int dmmp_mpath_update(struct dmmp_context *ctx, struct dmmp_mpath *dmmp_mp, json_object *j_obj_map); -DMMP_DLL_LOCAL int _dmmp_path_group_update(struct dmmp_context *ctx, +DMMP_DLL_LOCAL int dmmp_path_group_update(struct dmmp_context *ctx, struct dmmp_path_group *dmmp_pg, json_object *j_obj_pg); -DMMP_DLL_LOCAL int _dmmp_path_update(struct dmmp_context *ctx, +DMMP_DLL_LOCAL int dmmp_path_update(struct dmmp_context *ctx, struct dmmp_path *dmmp_p, json_object *j_obj_p); -DMMP_DLL_LOCAL void _dmmp_mpath_free(struct dmmp_mpath *dmmp_mp); -DMMP_DLL_LOCAL void _dmmp_path_group_free(struct dmmp_path_group *dmmp_pg); +DMMP_DLL_LOCAL void dmmp_mpath_free(struct dmmp_mpath *dmmp_mp); +DMMP_DLL_LOCAL void dmmp_path_group_free(struct dmmp_path_group *dmmp_pg); DMMP_DLL_LOCAL void _dmmp_path_group_array_free (struct dmmp_path_group **dmmp_pgs, uint32_t dmmp_pg_count); -DMMP_DLL_LOCAL void _dmmp_path_free(struct dmmp_path *dmmp_p); -DMMP_DLL_LOCAL void _dmmp_log(struct dmmp_context *ctx, int priority, +DMMP_DLL_LOCAL void dmmp_path_free(struct dmmp_path *dmmp_p); +DMMP_DLL_LOCAL void dmmp_log(struct dmmp_context *ctx, int priority, const char *file, int line, const char *func_name, const char *format, ...) __attribute__((format(printf, 6, 7))); DMMP_DLL_LOCAL void _dmmp_log_err_str(struct dmmp_context *ctx, int rc); -DMMP_DLL_LOCAL void _dmmp_log_stderr(struct dmmp_context *ctx, int priority, +DMMP_DLL_LOCAL void dmmp_log_stderr(struct dmmp_context *ctx, int priority, const char *file, int line, const char *func_name, const char *format, va_list args) @@ -146,7 +146,7 @@ DMMP_DLL_LOCAL void _dmmp_log_stderr(struct dmmp_context *ctx, int priority, #define _dmmp_log_cond(ctx, prio, arg...) \ do { \ if (dmmp_context_log_priority_get(ctx) >= prio) \ - _dmmp_log(ctx, prio, __FILE__, __LINE__, __FUNCTION__, \ + dmmp_log(ctx, prio, __FILE__, __LINE__, __FUNCTION__, \ ## arg); \ } while (0)

[36/41] libdmmp: rename non-static functions starting with underscore

Commit Message

Patch