Prevent terrible perf regression by getting the if-condition right

[fontconfig.git] / src / fcxml.c

diff --git a/src/fcxml.c b/src/fcxml.c
index 1590358fbd26319fa07a15b50af7f314c1faece7..7deeb137863a90b7e5a99ce7ba72bb45392964a1 100644 (file)
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -27,7 +27,7 @@
 #include "fcint.h"
 #include <dirent.h>
 
-#if ENABLE_LIBXML2
+#ifdef ENABLE_LIBXML2
 
 #include <libxml/parser.h>
 
@@ -339,7 +339,7 @@ typedef enum _FcElement {
     FcElementUnknown
 } FcElement;
 
-static struct {
+static const struct {
     const char  name[16];
     FcElement   element;
 } fcElementMap[] = {
@@ -1541,7 +1541,7 @@ FcPopBinary (FcConfigParse *parse, FcOp op)
                FcConfigMessage (parse, FcSevereError, "out of memory");
                FcExprDestroy (left);
                FcExprDestroy (expr);
-               break;
+               return 0;
            }
            expr = new;
        }
@@ -1950,6 +1950,7 @@ FcParsePatelt (FcConfigParse *parse)
     if (!name)
     {
        FcConfigMessage (parse, FcSevereWarning, "missing pattern element name");
+       FcPatternDestroy (pattern);
        return;
     }
     
@@ -1988,6 +1989,7 @@ FcParsePattern (FcConfigParse *parse)
            if (!FcPatternAppend (pattern, vstack->u.pattern))
            {
                FcConfigMessage (parse, FcSevereError, "out of memory");
+               FcPatternDestroy (pattern);
                return;
            }
            break;
@@ -2234,7 +2236,7 @@ FcStartDoctypeDecl (void      *userData,
        FcConfigMessage (parse, FcSevereError, "invalid doctype \"%s\"", doctypeName);
 }
 
-#if ENABLE_LIBXML2
+#ifdef ENABLE_LIBXML2
 
 static void
 FcInternalSubsetDecl (void            *userData,
@@ -2359,7 +2361,7 @@ FcConfigParseAndLoad (FcConfig        *config,
     FcConfigParse   parse;
     FcBool         error = FcTrue;
     
-#if ENABLE_LIBXML2
+#ifdef ENABLE_LIBXML2
     xmlSAXHandler   sax;
     char            buf[BUFSIZ];
 #else
@@ -2398,7 +2400,7 @@ FcConfigParseAndLoad (FcConfig        *config,
        goto bail0;
     }
     
-#if ENABLE_LIBXML2
+#ifdef ENABLE_LIBXML2
     memset(&sax, 0, sizeof(sax));
 
     sax.internalSubset = FcInternalSubsetDecl;
@@ -2419,7 +2421,7 @@ FcConfigParseAndLoad (FcConfig        *config,
     if (!FcConfigInit (&parse, name, config, p))
        goto bail2;
 
-#if !ENABLE_LIBXML2
+#ifndef ENABLE_LIBXML2
 
     XML_SetUserData (p, &parse);
     
@@ -2430,7 +2432,7 @@ FcConfigParseAndLoad (FcConfig        *config,
 #endif /* ENABLE_LIBXML2 */
 
     do {
-#if !ENABLE_LIBXML2
+#ifndef ENABLE_LIBXML2
        buf = XML_GetBuffer (p, BUFSIZ);
        if (!buf)
        {
@@ -2445,7 +2447,7 @@ FcConfigParseAndLoad (FcConfig        *config,
            goto bail3;
        }
 
-#if ENABLE_LIBXML2
+#ifdef ENABLE_LIBXML2
        if (xmlParseChunk (p, buf, len, len == 0))
 #else
        if (!XML_ParseBuffer (p, len, len == 0))