[11/41] libmpathutil: rename __append_strbuf_str() and __get_strbuf_buf()

Message ID	20240808152620.93965-12-mwilck@suse.com (mailing list archive)
State	Not Applicable, archived
Delegated to:	christophe varoqui
Headers	show Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 5699718FDB0 for <dm-devel@lists.linux.dev>; Thu, 8 Aug 2024 15:26:47 +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 11/41] libmpathutil: rename __append_strbuf_str() and __get_strbuf_buf() Date: Thu, 8 Aug 2024 17:25:50 +0200 Message-ID: <20240808152620.93965-12-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/libmpathutil/libmpathutil.version b/libmpathutil/libmpathutil.version index 8393b91..270dcd8 100644 --- a/libmpathutil/libmpathutil.version +++ b/libmpathutil/libmpathutil.version @@ -47,8 +47,8 @@ LIBMPATHUTIL_4.0 { global: alloc_bitfield; alloc_strvec; - __append_strbuf_str; append_strbuf_str; + append_strbuf_str__; append_strbuf_quoted; basenamecpy; cleanup_charp; @@ -71,7 +71,7 @@ global: free_strvec; get_linux_version_code; get_monotonic_time; - __get_strbuf_buf; + get_strbuf_buf__; get_next_string; get_strbuf_len; get_strbuf_str; diff --git a/libmpathutil/parser.c b/libmpathutil/parser.c index 29b212c..ab7d1aa 100644 --- a/libmpathutil/parser.c +++ b/libmpathutil/parser.c @@ -167,7 +167,7 @@ snprint_keyword(struct strbuf *buff, const char *fmt, struct keyword *kw, goto out; } if (f != fmt && - (r = __append_strbuf_str(&sbuf, fmt, f - fmt)) < 0) + (r = append_strbuf_str__(&sbuf, fmt, f - fmt)) < 0) goto out; fmt = f + 1; switch(*fmt) { @@ -191,7 +191,7 @@ snprint_keyword(struct strbuf *buff, const char *fmt, struct keyword *kw, } while (*fmt++); out: if (r >= 0) - r = __append_strbuf_str(buff, get_strbuf_str(&sbuf), + r = append_strbuf_str__(buff, get_strbuf_str(&sbuf), get_strbuf_len(&sbuf)); return r; } diff --git a/libmpathutil/strbuf.c b/libmpathutil/strbuf.c index 6e53c3f..491a343 100644 --- a/libmpathutil/strbuf.c +++ b/libmpathutil/strbuf.c @@ -15,7 +15,7 @@ static const char empty_str[] = ""; -char *__get_strbuf_buf(struct strbuf *buf) +char *get_strbuf_buf__(struct strbuf *buf) { return buf->buf; } @@ -110,7 +110,7 @@ static int expand_strbuf(struct strbuf *buf, int addsz) return 0; } -int __append_strbuf_str(struct strbuf *buf, const char *str, int slen) +int append_strbuf_str__(struct strbuf *buf, const char *str, int slen) { int ret; @@ -135,7 +135,7 @@ int append_strbuf_str(struct strbuf *buf, const char *str) if (slen > INT_MAX) return -ERANGE; - return __append_strbuf_str(buf, str, slen); + return append_strbuf_str__(buf, str, slen); } int fill_strbuf(struct strbuf *buf, char c, int slen) diff --git a/libmpathutil/strbuf.h b/libmpathutil/strbuf.h index 68f21de..790dc23 100644 --- a/libmpathutil/strbuf.h +++ b/libmpathutil/strbuf.h @@ -66,7 +66,7 @@ struct strbuf *new_strbuf(void); * If @strbuf was never written to, the function returns NULL. * The return value of this function must not be free()d. */ -char *__get_strbuf_buf(struct strbuf *buf); +char *get_strbuf_buf__(struct strbuf *buf); /** * get_strbuf_str(): retrieve string from strbuf @@ -112,7 +112,7 @@ size_t get_strbuf_len(const struct strbuf *buf); int truncate_strbuf(struct strbuf *buf, size_t offs); /** - * __append_strbuf_str(): append string of known length + * append_strbuf_str__(): append string of known length * @param buf: the struct strbuf to write to * @param str: the string to append, not necessarily 0-terminated * @param slen: max number of characters to append, must be non-negative @@ -123,7 +123,7 @@ int truncate_strbuf(struct strbuf *buf, size_t offs); * 0-bytes possibly contained in the first @slen characters are copied into * the output. If the function returns an error, @strbuf is unchanged. */ -int __append_strbuf_str(struct strbuf *buf, const char *str, int slen); +int append_strbuf_str__(struct strbuf *buf, const char *str, int slen); /** * append_strbuf_str(): append string diff --git a/libmultipath/alias.c b/libmultipath/alias.c index c4eb5d8..5c8ac93 100644 --- a/libmultipath/alias.c +++ b/libmultipath/alias.c @@ -242,7 +242,7 @@ static int write_bindings_file(const Bindings *bindings, int fd, int i; size_t len; - if (__append_strbuf_str(&content, BINDINGS_FILE_HEADER, + if (append_strbuf_str__(&content, BINDINGS_FILE_HEADER, sizeof(BINDINGS_FILE_HEADER) - 1) == -1) return -1; diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index 380e0e9..f130a5c 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -1336,14 +1336,14 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len, vpd += 4; len = vpd_len - 4; - if ((err = __append_strbuf_str(&buf, (const char *)vpd, len)) < 0) + if ((err = append_strbuf_str__(&buf, (const char *)vpd, len)) < 0) return err; /* The input is 0-padded, make sure the length is correct */ truncate_strbuf(&buf, strlen(get_strbuf_str(&buf))); len = get_strbuf_len(&buf); if (type != '8') { - char *buffer = __get_strbuf_buf(&buf); + char *buffer = get_strbuf_buf__(&buf); for (i = 0; i < len; ++i) buffer[i] = tolower(buffer[i]); @@ -1357,7 +1357,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len, return err; while (vpd && (p = memchr(vpd, ' ', vpd_len))) { p_len = p - vpd; - if ((err = __append_strbuf_str(&buf, (const char *)vpd, + if ((err = append_strbuf_str__(&buf, (const char *)vpd, p_len)) < 0) return err; vpd = p; @@ -1370,7 +1370,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len, return err; } if (vpd_len > 0) { - if ((err = __append_strbuf_str(&buf, (const char *)vpd, + if ((err = append_strbuf_str__(&buf, (const char *)vpd, vpd_len)) < 0) return err; } diff --git a/libmultipath/print.c b/libmultipath/print.c index b7af913..db0aa35 100644 --- a/libmultipath/print.c +++ b/libmultipath/print.c @@ -1090,7 +1090,7 @@ int snprint_multipath_header(struct strbuf *line, const char *format, for (f = strchr(format, '%'); f; f = strchr(++format, '%')) { int iwc; - if ((rc = __append_strbuf_str(line, format, f - format)) < 0) + if ((rc = append_strbuf_str__(line, format, f - format)) < 0) return rc; format = f + 1; @@ -1121,7 +1121,7 @@ int _snprint_multipath(const struct gen_multipath *gmp, for (f = strchr(format, '%'); f; f = strchr(++format, '%')) { int iwc; - if ((rc = __append_strbuf_str(line, format, f - format)) < 0) + if ((rc = append_strbuf_str__(line, format, f - format)) < 0) return rc; format = f + 1; @@ -1151,7 +1151,7 @@ int snprint_path_header(struct strbuf *line, const char *format, for (f = strchr(format, '%'); f; f = strchr(++format, '%')) { int iwc; - if ((rc = __append_strbuf_str(line, format, f - format)) < 0) + if ((rc = append_strbuf_str__(line, format, f - format)) < 0) return rc; format = f + 1; @@ -1181,7 +1181,7 @@ int _snprint_path(const struct gen_path *gp, struct strbuf *line, for (f = strchr(format, '%'); f; f = strchr(++format, '%')) { int iwc; - if ((rc = __append_strbuf_str(line, format, f - format)) < 0) + if ((rc = append_strbuf_str__(line, format, f - format)) < 0) return rc; format = f + 1; @@ -1208,7 +1208,7 @@ int _snprint_pathgroup(const struct gen_pathgroup *ggp, struct strbuf *line, int rc; for (f = strchr(format, '%'); f; f = strchr(++format, '%')) { - if ((rc = __append_strbuf_str(line, format, f - format)) < 0) + if ((rc = append_strbuf_str__(line, format, f - format)) < 0) return rc; format = f + 1; diff --git a/tests/strbuf.c b/tests/strbuf.c index d7d4cd9..1cc1618 100644 --- a/tests/strbuf.c +++ b/tests/strbuf.c @@ -78,7 +78,7 @@ static void test_strbuf_00(void **state) assert_string_equal(p, ""); free(p); - assert_int_equal(__append_strbuf_str(&buf, "x", 0), 0); + assert_int_equal(append_strbuf_str__(&buf, "x", 0), 0); /* appending a 0-length string allocates memory */ assert_in_range(buf.size, 1, SIZE_MAX); assert_int_equal(buf.offs, 0); @@ -181,9 +181,9 @@ static void test_strbuf_nul(void **state) STRBUF_ON_STACK(buf); char greet[] = "hello, sir!"; - assert_int_equal(__append_strbuf_str(&buf, greet, 6), 6); + assert_int_equal(append_strbuf_str__(&buf, greet, 6), 6); assert_string_equal(get_strbuf_str(&buf), "hello,"); - assert_int_equal(__append_strbuf_str(&buf, greet, 6), 6); + assert_int_equal(append_strbuf_str__(&buf, greet, 6), 6); assert_string_equal(get_strbuf_str(&buf), "hello,hello,"); /* overwrite comma with NUL; append_strbuf_str() stops at NUL byte */ @@ -196,14 +196,14 @@ static void test_strbuf_nul(void **state) assert_int_equal(get_strbuf_len(&buf), 10); assert_string_equal(get_strbuf_str(&buf), "hellohello"); - /* __append_strbuf_str() appends full memory, including NUL bytes */ + /* append_strbuf_str__() appends full memory, including NUL bytes */ reset_strbuf(&buf); - assert_int_equal(__append_strbuf_str(&buf, greet, sizeof(greet) - 1), + assert_int_equal(append_strbuf_str__(&buf, greet, sizeof(greet) - 1), sizeof(greet) - 1); assert_int_equal(get_strbuf_len(&buf), sizeof(greet) - 1); assert_string_equal(get_strbuf_str(&buf), "hello"); assert_string_equal(get_strbuf_str(&buf) + get_strbuf_len(&buf) - 5, " sir!"); - assert_int_equal(__append_strbuf_str(&buf, greet, sizeof(greet) - 1), + assert_int_equal(append_strbuf_str__(&buf, greet, sizeof(greet) - 1), sizeof(greet) - 1); assert_string_equal(get_strbuf_str(&buf), "hello"); assert_int_equal(get_strbuf_len(&buf), 2 * (sizeof(greet) - 1));

[11/41] libmpathutil: rename __append_strbuf_str() and __get_strbuf_buf()

Commit Message

Patch