[EGIT] [legacy/imlib2] master 02/02: Minor optimisation (avoid bogus valgrind complaint).

[Kim Woelders - Enlightenment Git]

kwo pushed a commit to branch master.

commit 7514ec5276f7395eeb9c5c05f7e8375385504c4c
Author: Kim Woelders <k...@woelders.dk>
Date:   Tue Jul 2 06:36:20 2013 +0200

    Minor optimisation (avoid bogus valgrind complaint).
---
 src/lib/font_load.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/lib/font_load.c b/src/lib/font_load.c
index 8c64821..b1f15a0 100644
--- a/src/lib/font_load.c
+++ b/src/lib/font_load.c
@@ -35,7 +35,7 @@ static int          font_flush_free_glyph_cb(Imlib_Hash * 
hash, const char *key,
 ImlibFont          *
 imlib_font_load_joined(const char *fontname)
 {
-   int                 j, k, size, faceidx;
+   int                 j, k, size, faceidx, namelen;
    char               *name, *file = NULL, *tmp;
    ImlibFont          *fn;
 
@@ -65,13 +65,14 @@ imlib_font_load_joined(const char *fontname)
         break;
      }
 
+   namelen = j;
    /* split name in front off */
-   name = malloc(j + 1);
-   memcpy(name, fontname, j);
-   name[j] = 0;
+   name = malloc(namelen + 1);
+   memcpy(name, fontname, namelen);
+   name[namelen] = 0;
 
    /* find file if it exists */
-   tmp = malloc(strlen(name) + 4 + 1);
+   tmp = malloc(namelen + 4 + 1);
    if (!tmp)
       goto done;
 
@@ -96,7 +97,7 @@ imlib_font_load_joined(const char *fontname)
      {
         for (j = 0; (j < fpath_num) && (!file); j++)
           {
-             tmp = malloc(strlen(fpath[j]) + 1 + strlen(name) + 4 + 1);
+             tmp = malloc(strlen(fpath[j]) + 1 + namelen + 4 + 1);
              if (!tmp)
                 goto done;
 

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev