(no commit message)

diff --git a/MagickCore/property.c b/MagickCore/property.c
index bc929ac565c314a36e6ad951e2d44eed330bf6ec..ad51c6bc99881662140daa2427a4f5acef82d28b 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1684,18 +1684,16 @@ static MagickBooleanType GetXMPProperty(const Image *image,const char *property)
         {
           child=GetXMLTreeChild(node,(const char *) NULL);
           content=GetXMLTreeContent(node);
-          if (child == (XMLTreeInfo *) NULL && SkipXMPValue(content) ==
-              MagickFalse)
+          if ((child == (XMLTreeInfo *) NULL) &&
+              (SkipXMPValue(content) == MagickFalse))
             (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
-              ConstantString(GetXMLTreeTag(node)),
-              ConstantString(content));
+              ConstantString(GetXMLTreeTag(node)),ConstantString(content));
           while (child != (XMLTreeInfo *) NULL)
           {
             content=GetXMLTreeContent(child);
             if (SkipXMPValue(content) == MagickFalse)
               (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
-                ConstantString(GetXMLTreeTag(child)),
-                ConstantString(content));
+                ConstantString(GetXMLTreeTag(child)),ConstantString(content));
             child=GetXMLTreeSibling(child);
           }
           node=GetXMLTreeSibling(node);

diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 657cc03abb07be355d426c6bf2b892e87728791c..c38de9a9a23d1cb6581f28142f0a6e734f8e96e0 100644 (file)
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -1928,14 +1928,15 @@ static void ParseOpenTag(XMLTreeRoot *root,char *tag,char **attributes)
   root->node=xml_info;
 }
 
-static const char *ignore_tags[3] =
-{
-  "rdf:Bag",
-  "rdf:Seq",
-  (const char *)NULL
-};
+static const char
+  *ignore_tags[3] =
+  {
+    "rdf:Bag",
+    "rdf:Seq",
+    (const char *) NULL
+  };
 
-static inline MagickBooleanType CanIgnoreTag(const char *tag)
+static inline MagickBooleanType IsSkipTag(const char *tag)
 {
   register ssize_t
     i;
@@ -2137,7 +2138,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
                 utf8=DestroyString(utf8);
                 return(&root->root);
               }
-            if (ignore_depth == 0 && CanIgnoreTag(tag) == MagickFalse)
+            if ((ignore_depth == 0) && (IsSkipTag(tag) == MagickFalse))
               {
                 ParseOpenTag(root,tag,attributes);
                 (void) ParseCloseTag(root,tag,exception);
@@ -2149,7 +2150,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
             if ((*p == '>') || ((*p == '\0') && (terminal == '>')))
               {
                 *p='\0';
-                if (ignore_depth == 0 && CanIgnoreTag(tag) == MagickFalse)
+                if ((ignore_depth == 0) && (IsSkipTag(tag) == MagickFalse))
                   ParseOpenTag(root,tag,attributes);
                 else
                   ignore_depth++;