2006-04-27 Paolo Borelli (pborelli@katamail.com) reviewed by: plam

Make FcStrCopy slightly more efficient.

diff --git a/ChangeLog b/ChangeLog
index 912520c203c30440fc79fc3e39c9fd4182ff0fa3..52ac61d827ba8dfc4cdf1f79f8df76e10800240d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-27  Paolo Borelli  (pborelli@katamail.com)
+       reviewed by: plam
+       
+       * src/fcstr.c (FcStrCopy):
+
+       Make FcStrCopy slightly more efficient.
+
 2006-04-27  Patrick Lam         <plam@mit.edu>
            Keith Packard  <keithp@keithp.com>
        * src/fcstr.c (FcStrBufChar):

diff --git a/src/fcstr.c b/src/fcstr.c
index e75ecb9b64e7048cf0dd64fadd604f2b2827e07d..5d1961c3af47ee0f74857d6ed7df4e9cea976cfc 100644 (file)
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -30,15 +30,17 @@
 FcChar8 *
 FcStrCopy (const FcChar8 *s)
 {
-    FcChar8    *r;
+    int     len;
+    FcChar8 *r;
 
     if (!s)
        return 0;
-    r = (FcChar8 *) malloc (strlen ((char *) s) + 1);
+    len = strlen ((char *) s) + 1;
+    r = (FcChar8 *) malloc (len);
     if (!r)
        return 0;
-    FcMemAlloc (FC_MEM_STRING, strlen ((char *) s) + 1);
-    strcpy ((char *) r, (char *) s);
+    FcMemAlloc (FC_MEM_STRING, len);
+    memcpy (r, s, len);
     return r;
 }
 
@@ -780,7 +782,7 @@ FcStrCopyFilename (const FcChar8 *s)
        if (!new)
            return 0;
        FcMemAlloc (FC_MEM_STRING, size);
-       strcpy ((char *) new, (const char *) s);
+       memcpy (new, s, size);
     }
     return new;
 }