Commit 00dc3ead authored by Kenichi Handa's avatar Kenichi Handa
Browse files

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

parent 9ba02fc3
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> 2012-11-13 Kenichi Handa <handa@gnu.org>
   
* font.c (font_unparse_xlfd): Exclude special characters from the * font.c (font_unparse_xlfd): Exclude special characters from the
......
...@@ -1185,7 +1185,7 @@ ptrdiff_t ...@@ -1185,7 +1185,7 @@ ptrdiff_t
font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes) font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
{ {
char *p; char *p;
char *f[XLFD_REGISTRY_INDEX + 1]; const char *f[XLFD_REGISTRY_INDEX + 1];
Lisp_Object val; Lisp_Object val;
int i, j, len; int i, j, len;
...@@ -1241,13 +1241,13 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes) ...@@ -1241,13 +1241,13 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
alloc = SBYTES (val) + 1; alloc = SBYTES (val) + 1;
if (nbytes <= alloc) if (nbytes <= alloc)
return -1; return -1;
f[j] = alloca (alloc); f[j] = p = alloca (alloc);
/* Copy the name while excluding '-', '?', ',', and '"'. */ /* Copy the name while excluding '-', '?', ',', and '"'. */
for (k = l = 0; k < alloc; k++) for (k = l = 0; k < alloc; k++)
{ {
c = SREF (val, k); c = SREF (val, k);
if (c != '-' && c != '?' && c != ',' && c != '"') if (c != '-' && c != '?' && c != ',' && c != '"')
f[j][l++] = c; p[l++] = c;
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment