font.c (font_unparse_xlfd): Fix previous change. Keep "const" for the variable "f".

diff --git a/src/ChangeLog b/src/ChangeLog
index ba476cd..d7699de 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-18  Kenichi Handa  <handa@gnu.org>
+
+       * font.c (font_unparse_xlfd): Fix previous change.  Keep "const"
+       for the variable "f".
+
 2012-11-13  Kenichi Handa  <handa@gnu.org>
 
        * font.c (font_unparse_xlfd): Exclude special characters from the

diff --git a/src/font.c b/src/font.c
index c57ca3c..f6b6fa0 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -1185,7 +1185,7 @@ ptrdiff_t
 font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
 {
   char *p;
-  char *f[XLFD_REGISTRY_INDEX + 1];
+  const char *f[XLFD_REGISTRY_INDEX + 1];
   Lisp_Object val;
   int i, j, len;
 
@@ -1241,13 +1241,13 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
          alloc = SBYTES (val) + 1;
          if (nbytes <= alloc)
            return -1;
-         f[j] = alloca (alloc);
+         f[j] = p = alloca (alloc);
          /* Copy the name while excluding '-', '?', ',', and '"'.  */
          for (k = l = 0; k < alloc; k++)
            {
              c = SREF (val, k);
              if (c != '-' && c != '?' && c != ',' && c != '"')
-               f[j][l++] = c;
+               p[l++] = c;
            }
        }
     }