removed mhl_str_concat_XXX() inlines
Этот коммит содержится в:
Enrico Weigelt, metux IT service
родитель
be3a8e13f9
Коммит
456e41a2a2
183
mhl/string.h
183
mhl/string.h
@ -100,189 +100,6 @@ static inline char* __mhl_str_concat_hlp(const char* base, ...)
|
||||
|
||||
#define mhl_str_concat(...) (__mhl_str_concat_hlp(__VA_ARGS__, (char*)(1)))
|
||||
|
||||
/* concat 1 string to another and return as mhl_mem_alloc()'ed string */
|
||||
static inline char* mhl_str_concat_1(const char* base, const char* one)
|
||||
{
|
||||
if (!base) return mhl_str_dup(one);
|
||||
if (!one) return mhl_str_dup(base);
|
||||
|
||||
int _sz_base = strlen(base);
|
||||
int _sz_one = strlen(one);
|
||||
|
||||
char* buf = mhl_mem_alloc_u(_sz_base+_sz_one+2);
|
||||
memcpy(buf, base, _sz_base);
|
||||
memcpy(buf+_sz_base, one, _sz_one);
|
||||
buf[_sz_base+_sz_one] = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
/* concat 2 strings to another and return as mhl_mem_alloc()'ed string */
|
||||
static inline char* mhl_str_concat_2(const char* base, const char* one, const char* two)
|
||||
{
|
||||
if (!base) base = "";
|
||||
if (!one) one = "";
|
||||
if (!two) two = "";
|
||||
|
||||
int _sz_base = strlen(base);
|
||||
int _sz_one = strlen(one);
|
||||
int _sz_two = strlen(two);
|
||||
|
||||
char* buf = mhl_mem_alloc_u(_sz_base+_sz_one+_sz_two+2);
|
||||
char* ptr = buf;
|
||||
memcpy(ptr, base, _sz_base); ptr+=_sz_base;
|
||||
memcpy(ptr, one, _sz_one); ptr+=_sz_one;
|
||||
memcpy(ptr, two, _sz_two); ptr+=_sz_two;
|
||||
*ptr = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
/* concat 3 strings to another and return as mhl_mem_alloc()'ed string */
|
||||
static inline char* mhl_str_concat_3(const char* base, const char* one, const char* two, const char* three)
|
||||
{
|
||||
if (!base) base = "";
|
||||
if (!one) one = "";
|
||||
if (!two) two = "";
|
||||
if (!three) three = "";
|
||||
|
||||
int _sz_base = strlen(base);
|
||||
int _sz_one = strlen(one);
|
||||
int _sz_two = strlen(two);
|
||||
int _sz_three = strlen(three);
|
||||
|
||||
char* buf = mhl_mem_alloc_u(_sz_base+_sz_one+_sz_two+_sz_three+2);
|
||||
char* ptr = buf;
|
||||
memcpy(ptr, base, _sz_base); ptr+=_sz_base;
|
||||
memcpy(ptr, one, _sz_one); ptr+=_sz_one;
|
||||
memcpy(ptr, two, _sz_two); ptr+=_sz_two;
|
||||
memcpy(ptr, three, _sz_three); ptr+=_sz_three;
|
||||
*ptr = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
/* concat 4 strings to another and return as mhl_mem_alloc()'ed string */
|
||||
static inline char* mhl_str_concat_4(const char* base, const char* one, const char* two, const char* three, const char* four)
|
||||
{
|
||||
if (!base) base = "";
|
||||
if (!one) one = "";
|
||||
if (!two) two = "";
|
||||
if (!three) three = "";
|
||||
if (!four) four = "";
|
||||
|
||||
int _sz_base = strlen(base);
|
||||
int _sz_one = strlen(one);
|
||||
int _sz_two = strlen(two);
|
||||
int _sz_three = strlen(three);
|
||||
int _sz_four = strlen(four);
|
||||
|
||||
char* buf = mhl_mem_alloc_u(_sz_base+_sz_one+_sz_two+_sz_three+_sz_four+2);
|
||||
char* ptr = buf;
|
||||
memcpy(ptr, base, _sz_base); ptr+=_sz_base;
|
||||
memcpy(ptr, one, _sz_one); ptr+=_sz_one;
|
||||
memcpy(ptr, two, _sz_two); ptr+=_sz_two;
|
||||
memcpy(ptr, three, _sz_three); ptr+=_sz_three;
|
||||
memcpy(ptr, four, _sz_four); ptr+=_sz_four;
|
||||
*ptr = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
/* concat 5 strings to another and return as mhl_mem_alloc()'ed string */
|
||||
static inline char* mhl_str_concat_5(const char* base, const char* one, const char* two, const char* three, const char* four, const char* five)
|
||||
{
|
||||
if (!base) base = "";
|
||||
if (!one) one = "";
|
||||
if (!two) two = "";
|
||||
if (!three) three = "";
|
||||
if (!four) four = "";
|
||||
if (!five) five = "";
|
||||
|
||||
int _sz_base = strlen(base);
|
||||
int _sz_one = strlen(one);
|
||||
int _sz_two = strlen(two);
|
||||
int _sz_three = strlen(three);
|
||||
int _sz_four = strlen(four);
|
||||
int _sz_five = strlen(five);
|
||||
|
||||
char* buf = mhl_mem_alloc_u(_sz_base+_sz_one+_sz_two+_sz_three+_sz_four+_sz_five+2);
|
||||
char* ptr = buf;
|
||||
memcpy(ptr, base, _sz_base); ptr+=_sz_base;
|
||||
memcpy(ptr, one, _sz_one); ptr+=_sz_one;
|
||||
memcpy(ptr, two, _sz_two); ptr+=_sz_two;
|
||||
memcpy(ptr, three, _sz_three); ptr+=_sz_three;
|
||||
memcpy(ptr, four, _sz_four); ptr+=_sz_four;
|
||||
memcpy(ptr, five, _sz_five); ptr+=_sz_five;
|
||||
*ptr = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
/* concat 6 strings to another and return as mhl_mem_alloc()'ed string */
|
||||
static inline char* mhl_str_concat_6(const char* base, const char* one, const char* two,
|
||||
const char* three, const char* four, const char* five, const char* six)
|
||||
{
|
||||
if (!base) base = "";
|
||||
if (!one) one = "";
|
||||
if (!two) two = "";
|
||||
if (!three) three = "";
|
||||
if (!four) four = "";
|
||||
if (!five) five = "";
|
||||
if (!six) six = "";
|
||||
|
||||
int _sz_base = strlen(base);
|
||||
int _sz_one = strlen(one);
|
||||
int _sz_two = strlen(two);
|
||||
int _sz_three = strlen(three);
|
||||
int _sz_four = strlen(four);
|
||||
int _sz_five = strlen(five);
|
||||
int _sz_six = strlen(six);
|
||||
|
||||
char* buf = mhl_mem_alloc_u(_sz_base+_sz_one+_sz_two+_sz_three+_sz_four+_sz_five+_sz_six+2);
|
||||
char* ptr = buf;
|
||||
memcpy(ptr, base, _sz_base); ptr+=_sz_base;
|
||||
memcpy(ptr, one, _sz_one); ptr+=_sz_one;
|
||||
memcpy(ptr, two, _sz_two); ptr+=_sz_two;
|
||||
memcpy(ptr, three, _sz_three); ptr+=_sz_three;
|
||||
memcpy(ptr, four, _sz_four); ptr+=_sz_four;
|
||||
memcpy(ptr, five, _sz_five); ptr+=_sz_five;
|
||||
memcpy(ptr, six, _sz_six); ptr+=_sz_six;
|
||||
*ptr = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
/* concat 7 strings to another and return as mhl_mem_alloc()'ed string */
|
||||
static inline char* mhl_str_concat_7(const char* base, const char* one, const char* two,
|
||||
const char* three, const char* four, const char* five, const char* six, const char* seven)
|
||||
{
|
||||
if (!base) base = "";
|
||||
if (!one) one = "";
|
||||
if (!two) two = "";
|
||||
if (!three) three = "";
|
||||
if (!four) four = "";
|
||||
if (!five) five = "";
|
||||
if (!six) six = "";
|
||||
if (!seven) seven = "";
|
||||
|
||||
int _sz_base = strlen(base);
|
||||
int _sz_one = strlen(one);
|
||||
int _sz_two = strlen(two);
|
||||
int _sz_three = strlen(three);
|
||||
int _sz_four = strlen(four);
|
||||
int _sz_five = strlen(five);
|
||||
int _sz_six = strlen(six);
|
||||
int _sz_seven = strlen(seven);
|
||||
|
||||
char* buf = mhl_mem_alloc_u(_sz_base+_sz_one+_sz_two+_sz_three+_sz_four+_sz_five+_sz_six+_sz_seven+2);
|
||||
char* ptr = buf;
|
||||
memcpy(ptr, base, _sz_base); ptr+=_sz_base;
|
||||
memcpy(ptr, one, _sz_one); ptr+=_sz_one;
|
||||
memcpy(ptr, two, _sz_two); ptr+=_sz_two;
|
||||
memcpy(ptr, three, _sz_three); ptr+=_sz_three;
|
||||
memcpy(ptr, four, _sz_four); ptr+=_sz_four;
|
||||
memcpy(ptr, five, _sz_five); ptr+=_sz_five;
|
||||
memcpy(ptr, six, _sz_six); ptr+=_sz_six;
|
||||
memcpy(ptr, seven, _sz_seven); ptr+=_sz_seven;
|
||||
*ptr = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
static inline char* mhl_str_reverse(char* ptr)
|
||||
{
|
||||
if (!ptr) return NULL; // missing string
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user