Refactor xy_strjoin() and rename old to xy_2strjoin()

This commit is contained in:
Aoran Zeng 2023-08-30 19:40:42 +08:00
parent 48f5d76951
commit c213b66b48

View File

@ -51,18 +51,6 @@ xy_malloc0 (size_t size)
}
static char*
xy_strjoin (const char* str1, const char* str2)
{
size_t len = strlen(str1);
size_t size = len + strlen(str2) + 1;
char* ret = malloc(size);
strcpy(ret, str1);
strcpy(ret+len, str2);
return ret;
}
#define XY_INFO 1
#define XY_SUCCESS 1<<1
#define XY_WARN 1<<2
@ -138,4 +126,54 @@ xy_warn (const char* str1)
free(buf);
}
static char*
xy_2strjoin (const char* str1, const char* str2)
{
size_t len = strlen(str1);
size_t size = len + strlen(str2) + 1;
char* ret = malloc(size);
strcpy(ret, str1);
strcpy(ret+len, str2);
return ret;
}
static char*
xy_strjoin (unsigned int count, ...)
{
size_t al_fixed = 64;
char* ret = calloc(1, al_fixed);
// 已分配次数
int al_times = 1;
// 当前已分配量
size_t al_cur = al_fixed;
const char* str = NULL;
// 需要分配的量
size_t al_need = 0;
// 用于 strcpy() 到 ret 的哪个位置
char* cur = ret + 0;
va_list args;
va_start(args, count);
for(int i=0; i<count; i++)
{
str = va_arg(args, const char*);
al_need += strlen(str);
if (al_need > al_cur) {
al_times += 1; al_cur = al_times * al_fixed;
ret = realloc(ret, al_cur);
if (NULL==ret) { xy_error ("xy: No availble memory!"); return NULL; }
}
strcpy(cur, str);
cur += strlen(str);
}
va_end(args);
*cur = '\0';
return ret;
}
#endif