Commit b456c0f79 for imagemagick.org

commit b456c0f790d83af9b504d998e6591c1729232067
Author: Dirk Lemstra <dirk@lemstra.org>
Date:   Fri Oct 30 10:22:47 2026 +0100

    Minor code cleanup.

diff --git a/coders/uil.c b/coders/uil.c
index c35f9ad44..d1125f6df 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -164,6 +164,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
     basename[MagickPathExtent],
     buffer[MagickPathExtent],
     name[MagickPathExtent],
+    *sanitized_basename,
     *symbol;

   int
@@ -294,12 +295,10 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
   symbol=AcquireString("");
   (void) WriteBlobString(image,"/* UIL */\n");
   GetPathComponent(image->filename,BasePath,basename);
-  {
-    char *sanitized_basename = SanitizeStringForIdentifier(basename);
-    (void) FormatLocaleString(buffer,MagickPathExtent,
-      "value\n  %s_ct : color_table(\n",sanitized_basename);
-    sanitized_basename=DestroyString(sanitized_basename);
-  }
+  sanitized_basename=SanitizeStringForIdentifier(basename);
+  (void) FormatLocaleString(buffer,MagickPathExtent,
+    "value\n  %s_ct : color_table(\n",sanitized_basename);
+  sanitized_basename=DestroyString(sanitized_basename);
   (void) WriteBlobString(image,buffer);
   GetPixelInfo(image,&pixel);
   for (i=0; i < (ssize_t) colors; i++)
@@ -344,13 +343,11 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
     Define UIL pixels.
   */
   GetPathComponent(image->filename,BasePath,basename);
-  {
-    char *sanitized_basename = SanitizeStringForIdentifier(basename);
-    (void) FormatLocaleString(buffer,MagickPathExtent,
-      "  %s_icon : icon(color_table = %s_ct,\n",sanitized_basename,
-      sanitized_basename);
-    sanitized_basename=DestroyString(sanitized_basename);
-  }
+  sanitized_basename=SanitizeStringForIdentifier(basename);
+  (void) FormatLocaleString(buffer,MagickPathExtent,
+    "  %s_icon : icon(color_table = %s_ct,\n",sanitized_basename,
+    sanitized_basename);
+  sanitized_basename=DestroyString(sanitized_basename);
   (void) WriteBlobString(image,buffer);
   for (y=0; y < (ssize_t) image->rows; y++)
   {
diff --git a/coders/xpm.c b/coders/xpm.c
index d83545119..0fa08d238 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -954,7 +954,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
     basename[MagickPathExtent],
     name[MagickPathExtent],
     symbol[MagickPathExtent],
-    *sanitized_filename;
+    *sanitized_value;

   const Quantum
     *p;
@@ -1066,10 +1066,10 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
   */
   (void) WriteBlobString(image,"/* XPM */\n");
   GetPathComponent(image->filename,BasePath,basename);
-  sanitized_filename=SanitizeStringForIdentifier(basename);
+  sanitized_value=SanitizeStringForIdentifier(basename);
   (void) FormatLocaleString(buffer,MagickPathExtent,
-    "static char *%.1024s[] = {\n",sanitized_filename);
-  sanitized_filename=DestroyString(sanitized_filename);
+    "static char *%.1024s[] = {\n",sanitized_value);
+  sanitized_value=DestroyString(sanitized_value);
   (void) WriteBlobString(image,buffer);
   (void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n");
   (void) FormatLocaleString(buffer,MagickPathExtent,
@@ -1114,10 +1114,10 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
         "\"%.1024s c %.1024s\",\n",symbol,name);
     else
       {
-        char *sanitized_symbolic = SanitizeStringForIdentifier(symbolic);
+        sanitized_value=SanitizeStringForIdentifier(symbolic);
         (void) FormatLocaleString(buffer,MagickPathExtent,
-          "\"%.1024s c %.1024s s %.1024s\",\n",symbol,name,sanitized_symbolic);
-        sanitized_symbolic=DestroyString(sanitized_symbolic);
+          "\"%.1024s c %.1024s s %.1024s\",\n",symbol,name,sanitized_value);
+        sanitized_value=DestroyString(sanitized_value);
       }
     (void) WriteBlobString(image,buffer);
   }