Better practices string copying

1 files changed, 5 insertions, 9 deletions

diff --git a/cleanstring.c b/cleanstring.c
index 86eef34..9313eaf 100644
--- a/cleanstring.c
+++ b/cleanstring.c
@@ -26,20 +26,16 @@ SOFTWARE. */
 #include "cleanstring.h"
 
 char* cleantocstring(CleanString s) {
-    char* cs = malloc(sizeof(char) * CleanStringLength(s) + 1);
-    int i;
-    for (i = 0; i < CleanStringLength(s); i++)
-        cs[i] = CleanStringCharacters(s)[i];
-    cs[i] = 0;
+    char* cs = malloc(CleanStringLength(s) + 1);
+    memcpy(cs, CleanStringCharacters(s), CleanStringLength(s));
+    cs[CleanStringLength(s)] = 0;
     return cs;
 }
 
 CleanString* ctocleanstring(char* s) {
-    CleanString* cs = malloc(sizeof(long) + sizeof(char)*strlen(s));
+    CleanString* cs = malloc(sizeof(long) + strlen(s));
     *((long*)cs) = (long) strlen(s);
-    int i = 0;
-    for (; s[i]; i++)
-        *((char*)cs + ((int)sizeof(long))+i) = s[i];
+    strcpy(((char*) cs) + sizeof(long), s);
     return cs;
 }