kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-25 21:55:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move concat_strings from path.c

Browse Source
This commit is contained in:
John Schmidt 2014-04-28 22:32:26 +02:00 committed by Thiago de Arruda
parent 7a4d24d4cc
commit 3f6fe2a888
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/path.c
View File

@ -283,18 +283,6 @@ char_u *concat_fnames(char_u *fname1, char_u *fname2, int sep)
return dest;
}
/*
* Concatenate two strings and return the result in allocated memory.
*/
char_u *concat_str(char_u *str1, char_u *str2)
{
size_t l = STRLEN(str1);
char_u *dest = xmalloc(l + STRLEN(str2) + 1);
STRCPY(dest, str1);
STRCPY(dest + l, str2);
return dest;
}
/*
* Add a path separator to a file name, unless it already ends in a path
* separator.

14
src/strings.c
View File

@ -534,3 +534,17 @@ int has_non_ascii(char_u *s)
return FALSE;
}
#endif
/*
* Concatenate two strings and return the result in allocated memory.
* Returns NULL when out of memory.
*/
char_u *concat_str(char_u *str1, char_u *str2)
{
size_t l = STRLEN(str1);
char_u *dest = xmalloc(l + STRLEN(str2) + 1);
STRCPY(dest, str1);
STRCPY(dest + l, str2);
return dest;
}

1
src/strings.h
View File

@ -23,4 +23,5 @@ char_u *vim_strbyte(char_u *string, int c);
char_u *vim_strrchr(char_u *string, int c);
int vim_isspace(int x);
void sort_strings(char_u **files, int count);
char_u *concat_str(char_u *str1, char_u *str2);
#endif