Skip to content

Commit 8f40fde

Browse files
committed
Unify tlx::split
1 parent 1be4ce7 commit 8f40fde

File tree

14 files changed

+510
-237
lines changed

14 files changed

+510
-237
lines changed

3rdparty/yasio/yasio/bindings/yasio_ni.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ YASIO_NI_API void yasio_set_option(void* service_ptr, int opt, const char* pszAr
156156
std::string strArgs = pszArgs;
157157
std::array<cxx17::string_view, YASIO_MAX_OPTION_ARGC> args;
158158
int argc = 0;
159-
yasio::split_if(&strArgs.front(), ';', [&](char* s, char* e) {
159+
tlx::split_if(&strArgs.front(), ';', [&](char* s, char* e) {
160160
if (e) {
161161
*e = '\0'; // to c style string
162162
args[argc++] = cxx17::string_view(s, e - s);

3rdparty/yasio/yasio/impl/mbedtls.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SOFTWARE.
3131

3232
#if YASIO_SSL_BACKEND == 2
3333

34-
# include "yasio/split.hpp"
34+
# include "yasio/tlx/split.hpp"
3535

3636
YASIO__DECL yssl_ctx_st* yssl_ctx_new(const yssl_options& opts)
3737
{
@@ -65,9 +65,9 @@ YASIO__DECL yssl_ctx_st* yssl_ctx_new(const yssl_options& opts)
6565
if (yasio__valid_str(opts.crtfile_)) // the cafile_ must be full path
6666
{
6767
int fail_count = 0;
68-
yasio::split(
68+
tlx::split(
6969
opts.crtfile_, ',', [&](char* first, char* last) {
70-
yasio::split_term null_term(last);
70+
tlx::split_term_guard null_term(last);
7171

7272
if ((ret = ::mbedtls_x509_crt_parse_file(&ctx->cert, first)) != 0)
7373
{

3rdparty/yasio/yasio/impl/openssl.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SOFTWARE.
3131

3232
#if YASIO_SSL_BACKEND == 1 // OpenSSL
3333

34-
# include "yasio/split.hpp"
34+
# include "yasio/tlx/split.hpp"
3535

3636
// The ssl error mask (1 << 31), a little hack, but works
3737
# define YSSL_ERR_MASK 0x80000000
@@ -53,8 +53,8 @@ YASIO__DECL yssl_ctx_st* yssl_ctx_new(const yssl_options& opts)
5353
if (yasio__valid_str(opts.crtfile_))
5454
{ // CAfile for verify
5555
fail_count = 0;
56-
yasio::split(opts.crtfile_, ',', [&](char* first, char* last) {
57-
yasio::split_term null_term(last);
56+
tlx::split(opts.crtfile_, ',', [&](char* first, char* last) {
57+
tlx::split_term_guard null_term(last);
5858

5959
# if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
6060
/* OpenSSL 3.0.0 has deprecated SSL_CTX_load_verify_locations */

3rdparty/yasio/yasio/split.hpp

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)