fef/libneo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

string: nstrcat refactor

Browse source
This commit is contained in:
anna 2021-07-15 23:14:55 +02:00
parent 2fbbfc61c0
commit aae039ae29
Signed by: fef
GPG key ID: EC22E476DC2D3D84
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/string/nstrcat.c
View file

@ -1,5 +1,8 @@
/** See the end of this file for copyright and license terms. */ /** See the end of this file for copyright and license terms. */
/* strnlen */
#define _POSIX_C_SOURCE 200809L
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
@ -21,15 +24,17 @@ string *nstrcat(const string *s1, const string *s2, error *err)
return nil; return nil;
} }
usize s1_size = strlen(s1->_data); usize s1_size_without_nul = strlen(s1->_data);
usize s2_size = strlen(s2->_data); usize s2_size_without_nul = strlen(s2->_data);
char *cat = nalloc(s1_size + s2_size + 1, err); usize cat_size = s1_size_without_nul + s2_size_without_nul + 1;
char *cat = nalloc(cat_size, err);
catch(err) { catch(err) {
return nil; return nil;
} }
strcpy(cat, s1->_data); memcpy(cat, s1->_data, s1_size_without_nul);
strcpy(cat + s1_size, s2->_data); memcpy(cat + s1_size_without_nul, s2->_data, s2_size_without_nul);
cat[s1_size_without_nul + s2_size_without_nul] = '\0';
string *ret = nstr(cat, err); string *ret = nstr(cat, err);
nfree(cat); nfree(cat);