Eliminate redundancies.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 0aed5dcbbd796f8d22908c70336db3a61eacd407..4cd5ac4678912718a8577869fbe9489b7283e514 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-21  Paul Cornett  <paulcor1@bullseye.com>
+       reviewed by: plam
+
+       * src/fccache.c (FcDirCacheWrite):
+       * src/fcdir.c (FcFileScanConfig):
+       * src/fcfreetype.c (FcStringInPatternElement):
+       * src/fcxml.c (FcParseFamilies):
+       * src/ftglue.c (ftglue_face_goto_table):
+
+       Eliminate redundancies.
+
 2006-02-21  Kjartan Maraas  <kmaraas@gnome.org>
        reviewed by: plam
 

diff --git a/src/fccache.c b/src/fccache.c
index 98f0a88294ea837ac07b4e9dc55af3a8ab0ceae5..eda5de0e2b2520acf274ec17bdf8bc3249e82c1d 100644 (file)
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 #define ENDIAN_TEST 0x12345678
-#define MACHINE_SIGNATURE_SIZE 9 + 5*20 + 1
+#define MACHINE_SIGNATURE_SIZE (9 + 5*20 + 1)
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -1371,6 +1371,7 @@ FcDirCacheWrite (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
                 metadata.count)
            perror("write current_dir_block");
        free (current_dir_block);
+        current_dir_block = 0;
     }
 
     /* this actually serves to pad out the cache file, if needed */

diff --git a/src/fcdir.c b/src/fcdir.c
index 18cb6cc90e5f12923f085973fea3be82b78f5120..7e59452d1f0f108b656af8755e917e29e62ba502 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -55,9 +55,6 @@ FcFileScanConfig (FcFontSet   *set,
     if (FcFileIsDir (file))
        return FcStrSetAdd (dirs, file);
 
-    if (force)
-       cache = 0;
-
     id = 0;
     do
     {

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 4ce9f961c6259684e3fb51e006e3048271fc1985..de20fd78163d6e365ba088dcb24a2d9b5262b2e7 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -976,7 +976,6 @@ FcStringInPatternElement (FcPattern *pat, const char *elt, FcChar8 *string)
        if (!FcStrCmpIgnoreBlanksAndCase (old, string))
        {
            return FcTrue;
-           break;
        }
     return FcFalse;
 }

diff --git a/src/fcxml.c b/src/fcxml.c
index 9aee89891a0ff6a758f797e06ade66985db1ce67..1590358fbd26319fa07a15b50af7f314c1faece7 100644 (file)
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1320,8 +1320,7 @@ FcParseFamilies (FcConfigParse *parse, FcVStackTag tag)
        if (!FcVStackPushExpr (parse, tag, expr))
        {
            FcConfigMessage (parse, FcSevereError, "out of memory");
-           if (expr)
-               FcExprDestroy (expr);
+            FcExprDestroy (expr);
        }
     }
 }

diff --git a/src/ftglue.c b/src/ftglue.c
index ebddfa74b056100372718e4110a8f2c9bb1712a2..5b48b11aca2e33d133da1f4921f90f848100bc4c 100644 (file)
--- a/src/ftglue.c
+++ b/src/ftglue.c
@@ -290,7 +290,6 @@ ftglue_face_goto_table( FT_Face    face,
     if ( face->num_faces > 1 )
     {
       /* deal with TrueType collections */
-      FT_ULong  offset;
 
       LOG(( ">> This is a TrueType Collection\n" ));