From fc689a02ba32b0d25b563f183a13aeeb3e204715 Mon Sep 17 00:00:00 2001 From: YuQing <384681@qq.com> Date: Sat, 9 Aug 2025 15:22:04 +0800 Subject: [PATCH] rename fc_combine_two_string to fc_combine_two_strings --- src/sf_binlog_index.c | 2 +- src/sf_binlog_writer.c | 2 +- src/sf_file_writer.c | 2 +- src/sf_ordered_writer.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sf_binlog_index.c b/src/sf_binlog_index.c index a8e5677..9ff1f2c 100644 --- a/src/sf_binlog_index.c +++ b/src/sf_binlog_index.c @@ -229,7 +229,7 @@ int sf_binlog_index_save(SFBinlogIndexContext *ctx) int result; char tmp_filename[PATH_MAX]; - fc_combine_two_string(ctx->filename, "tmp", '.', tmp_filename); + fc_combine_two_strings(ctx->filename, "tmp", '.', tmp_filename); if ((result=save(ctx, tmp_filename)) != 0) { return result; } diff --git a/src/sf_binlog_writer.c b/src/sf_binlog_writer.c index 93f5a56..2ffe295 100644 --- a/src/sf_binlog_writer.c +++ b/src/sf_binlog_writer.c @@ -357,7 +357,7 @@ static void *binlog_writer_func(void *arg) #ifdef OS_LINUX { char thread_name[64]; - fc_combine_two_string(thread->name, "writer", '-', thread_name); + fc_combine_two_strings(thread->name, "writer", '-', thread_name); prctl(PR_SET_NAME, thread_name); } #endif diff --git a/src/sf_file_writer.c b/src/sf_file_writer.c index 3a16af4..bad73a9 100644 --- a/src/sf_file_writer.c +++ b/src/sf_file_writer.c @@ -266,7 +266,7 @@ static int open_next_binlog(SFFileWriterInfo *writer) formatDatetime(g_current_time, "%Y%m%d%H%M%S", date_str, sizeof(date_str)); - fc_combine_two_string(writer->file.name.str, + fc_combine_two_strings(writer->file.name.str, date_str, '.', bak_filename); if (rename(writer->file.name.str, bak_filename) == 0) { logWarning("file: "__FILE__", line: %d, " diff --git a/src/sf_ordered_writer.c b/src/sf_ordered_writer.c index 6168384..1514f20 100644 --- a/src/sf_ordered_writer.c +++ b/src/sf_ordered_writer.c @@ -142,7 +142,7 @@ static void *binlog_writer_func(void *arg) #ifdef OS_LINUX { char thread_name[64]; - fc_combine_two_string(thread->name, "writer", '-', thread_name); + fc_combine_two_strings(thread->name, "writer", '-', thread_name); prctl(PR_SET_NAME, thread_name); } #endif