Changeset 1548

Timestamp:

Apr 22, 2016, 9:58:47 PM (9 years ago)

Author:

dmik

Message:

fontconfig: Redo r1547.

File:

• fontconfig/trunk/src/fccache.c (modified) (2 diffs)

fontconfig/trunk/src/fccache.c ¶

@@ -1174 +1174 @@
             break;
         fd = FcOpen ((const char *)cache_hashed, O_RDWR);
+        FcStrFree (cache_hashed);
         /* No caches in that directory. simply retry with another one */
         if (fd != -1)
@@ -1194 +1195 @@
         }
     }
-    goto bail0;
+    return fd;
 bail:
     if (fd != -1)
-    {
         close (fd);
-        fd = -1;
-    }
-bail0:
-    if (cache_hashed)
-        FcStrFree (cache_hashed);
-    return fd;
+    return -1;
 }