rename fc_combine_two_string to fc_combine_two_strings
parent
7b3f6d620a
commit
fc689a02ba
|
|
@ -229,7 +229,7 @@ int sf_binlog_index_save(SFBinlogIndexContext *ctx)
|
||||||
int result;
|
int result;
|
||||||
char tmp_filename[PATH_MAX];
|
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) {
|
if ((result=save(ctx, tmp_filename)) != 0) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -357,7 +357,7 @@ static void *binlog_writer_func(void *arg)
|
||||||
#ifdef OS_LINUX
|
#ifdef OS_LINUX
|
||||||
{
|
{
|
||||||
char thread_name[64];
|
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);
|
prctl(PR_SET_NAME, thread_name);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ static int open_next_binlog(SFFileWriterInfo *writer)
|
||||||
|
|
||||||
formatDatetime(g_current_time, "%Y%m%d%H%M%S",
|
formatDatetime(g_current_time, "%Y%m%d%H%M%S",
|
||||||
date_str, sizeof(date_str));
|
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);
|
date_str, '.', bak_filename);
|
||||||
if (rename(writer->file.name.str, bak_filename) == 0) {
|
if (rename(writer->file.name.str, bak_filename) == 0) {
|
||||||
logWarning("file: "__FILE__", line: %d, "
|
logWarning("file: "__FILE__", line: %d, "
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ static void *binlog_writer_func(void *arg)
|
||||||
#ifdef OS_LINUX
|
#ifdef OS_LINUX
|
||||||
{
|
{
|
||||||
char thread_name[64];
|
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);
|
prctl(PR_SET_NAME, thread_name);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue