commit b81f0abf7970b3c3e43ba0c95266a1c252806425
author dirk <dirk@git.imagemagick.org> Tue Oct 20 23:01:53 2015 +0200
committer dirk <dirk@git.imagemagick.org> Tue Oct 20 23:01:53 2015 +0200
tree a45d3b6100ebcc11212a3ea83d28f54b5c2f35a4
parent c9dbca3091582bcb9f705775e798d58e6360908d

Fixed various warnings reported by Visual Studio 2015 and did some minor refactoring.

MagickCore/configure.c

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index d51e227..3671488 100755
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -1208,7 +1208,7 @@
                 {
                   char
                     path[MagickPathExtent],
-                    *fileXml;
+                    *file_xml;
 
                   GetPathComponent(filename,HeadPath,path);
                   if (*path != '\0')
@@ -1218,12 +1218,12 @@
                     (void) CopyMagickString(path,token,MagickPathExtent);
                   else
                     (void) ConcatenateMagickString(path,token,MagickPathExtent);
-                  fileXml=FileToXML(path,~0UL);
-                  if (fileXml != (char *) NULL)
+                  file_xml=FileToXML(path,~0UL);
+                  if (file_xml != (char *) NULL)
                     {
-                      status&=LoadConfigureCache(configure_cache,fileXml,path,
+                      status&=LoadConfigureCache(configure_cache,file_xml,path,
                         depth+1,exception);
-                      fileXml=(char *) RelinquishMagickMemory(fileXml);
+                      file_xml=DestroyString(file_xml);
                     }
                 }
             }