diff options
| author | Pauli <pauli@openssl.org> | 2022-02-23 23:52:52 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-02-28 06:24:27 +0100 |
| commit | 28e141c45d36757e052b72685fb874968f013d43 (patch) | |
| tree | 8378c171058e959210f9560e461b513122fc2c27 /crypto/o_str.c | |
| parent | fetch: convert a NULL property query to "" (diff) | |
| download | openssl-28e141c45d36757e052b72685fb874968f013d43.tar.xz openssl-28e141c45d36757e052b72685fb874968f013d43.zip | |
Change `strlen' argument name to `strlength' to avoid c++ reserved words.
Fixes #17753
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/17764)
Diffstat (limited to 'crypto/o_str.c')
| -rw-r--r-- | crypto/o_str.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/o_str.c b/crypto/o_str.c index 649a669d25..4b740172d2 100644 --- a/crypto/o_str.c +++ b/crypto/o_str.c @@ -215,7 +215,7 @@ unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen) return ossl_hexstr2buf_sep(str, buflen, DEFAULT_SEPARATOR); } -static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlen, +static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength, const unsigned char *buf, size_t buflen, const char sep) { @@ -226,8 +226,8 @@ static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlen, int has_sep = (sep != CH_ZERO); size_t len = has_sep ? buflen * 3 : 1 + buflen * 2; - if (strlen != NULL) - *strlen = len; + if (strlength != NULL) + *strlength = len; if (str == NULL) return 1; @@ -253,11 +253,11 @@ static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlen, return 1; } -int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlen, +int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlength, const unsigned char *buf, size_t buflen, const char sep) { - return buf2hexstr_sep(str, str_n, strlen, buf, buflen, sep); + return buf2hexstr_sep(str, str_n, strlength, buf, buflen, sep); } char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep) |