FcStrPlus: optimize a little

[fontconfig.git] / src / fcstr.c

diff --git a/src/fcstr.c b/src/fcstr.c
index 8b94ecba5c4092491187b8e113b0b28d9285f7cc..b712e5dafd52e698f52defbcb88ba658241c1bc1 100644 (file)
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -50,14 +50,16 @@ FcStrCopy (const FcChar8 *s)
 FcChar8 *
 FcStrPlus (const FcChar8 *s1, const FcChar8 *s2)
 {
-    int            l = strlen ((char *)s1) + strlen ((char *) s2) + 1;
+    int            s1l = strlen ((char *) s1);
+    int            s2l = strlen ((char *) s2);
+    int            l = s1l + s2l + 1;
     FcChar8 *s = malloc (l);
 
     if (!s)
        return 0;
     FcMemAlloc (FC_MEM_STRING, l);
-    strcpy ((char *) s, (char *) s1);
-    strcat ((char *) s, (char *) s2);
+    memcpy (s, s1, s1l);
+    memcpy (s + s1l, s2, s2l + 1);
     return s;
 }