diff options
| author | Adrian Robert | 2009-10-13 01:03:38 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-10-13 01:03:38 +0000 |
| commit | c56c14a12fb88af5e651773027edf0fd413a7403 (patch) | |
| tree | 8151e904c268b50cb5b5d4c7ecbc690cb2d1659f /src | |
| parent | 603f0bf0d9bfffaca599687d9a142112a9d4eee7 (diff) | |
| download | emacs-c56c14a12fb88af5e651773027edf0fd413a7403.tar.gz emacs-c56c14a12fb88af5e651773027edf0fd413a7403.zip | |
(font_unparse_xlfd, font_unparse_fcname): Use long format in printf, and cast argument.
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/font.c b/src/font.c index 1cd596b9139..2e5db2d8f10 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1352,8 +1352,8 @@ font_unparse_xlfd (font, pixel_size, name, nbytes) | |||
| 1352 | if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) | 1352 | if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) |
| 1353 | { | 1353 | { |
| 1354 | f[XLFD_AVGWIDTH_INDEX] = alloca (11); | 1354 | f[XLFD_AVGWIDTH_INDEX] = alloca (11); |
| 1355 | len += sprintf (f[XLFD_AVGWIDTH_INDEX], | 1355 | len += sprintf (f[XLFD_AVGWIDTH_INDEX], "%ld", |
| 1356 | "%d", XINT (AREF (font, FONT_AVGWIDTH_INDEX))) + 1; | 1356 | (long) XINT (AREF (font, FONT_AVGWIDTH_INDEX))) + 1; |
| 1357 | } | 1357 | } |
| 1358 | else | 1358 | else |
| 1359 | f[XLFD_AVGWIDTH_INDEX] = "*", len += 2; | 1359 | f[XLFD_AVGWIDTH_INDEX] = "*", len += 2; |
| @@ -1669,7 +1669,7 @@ font_unparse_fcname (font, pixel_size, name, nbytes) | |||
| 1669 | } | 1669 | } |
| 1670 | 1670 | ||
| 1671 | if (INTEGERP (AREF (font, FONT_DPI_INDEX))) | 1671 | if (INTEGERP (AREF (font, FONT_DPI_INDEX))) |
| 1672 | len += sprintf (work, ":dpi=%d", XINT (AREF (font, FONT_DPI_INDEX))); | 1672 | len += sprintf (work, ":dpi=%ld", (long)XINT (AREF (font, FONT_DPI_INDEX))); |
| 1673 | if (INTEGERP (AREF (font, FONT_SPACING_INDEX))) | 1673 | if (INTEGERP (AREF (font, FONT_SPACING_INDEX))) |
| 1674 | len += strlen (":spacing=100"); | 1674 | len += strlen (":spacing=100"); |
| 1675 | if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) | 1675 | if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) |
| @@ -1682,7 +1682,7 @@ font_unparse_fcname (font, pixel_size, name, nbytes) | |||
| 1682 | if (STRINGP (val)) | 1682 | if (STRINGP (val)) |
| 1683 | len += SBYTES (val); | 1683 | len += SBYTES (val); |
| 1684 | else if (INTEGERP (val)) | 1684 | else if (INTEGERP (val)) |
| 1685 | len += sprintf (work, "%d", XINT (val)); | 1685 | len += sprintf (work, "%ld", (long) XINT (val)); |
| 1686 | else if (SYMBOLP (val)) | 1686 | else if (SYMBOLP (val)) |
| 1687 | len += (NILP (val) ? 5 : 4); /* for "false" or "true" */ | 1687 | len += (NILP (val) ? 5 : 4); /* for "false" or "true" */ |
| 1688 | } | 1688 | } |
| @@ -1709,9 +1709,10 @@ font_unparse_fcname (font, pixel_size, name, nbytes) | |||
| 1709 | p += sprintf (p, ":%s=%s", style_names[i], | 1709 | p += sprintf (p, ":%s=%s", style_names[i], |
| 1710 | SDATA (SYMBOL_NAME (styles[i]))); | 1710 | SDATA (SYMBOL_NAME (styles[i]))); |
| 1711 | if (INTEGERP (AREF (font, FONT_DPI_INDEX))) | 1711 | if (INTEGERP (AREF (font, FONT_DPI_INDEX))) |
| 1712 | p += sprintf (p, ":dpi=%d", XINT (AREF (font, FONT_DPI_INDEX))); | 1712 | p += sprintf (p, ":dpi=%ld", (long) XINT (AREF (font, FONT_DPI_INDEX))); |
| 1713 | if (INTEGERP (AREF (font, FONT_SPACING_INDEX))) | 1713 | if (INTEGERP (AREF (font, FONT_SPACING_INDEX))) |
| 1714 | p += sprintf (p, ":spacing=%d", XINT (AREF (font, FONT_SPACING_INDEX))); | 1714 | p += sprintf (p, ":spacing=%ld", |
| 1715 | (long) XINT (AREF (font, FONT_SPACING_INDEX))); | ||
| 1715 | if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) | 1716 | if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) |
| 1716 | { | 1717 | { |
| 1717 | if (XINT (AREF (font, FONT_AVGWIDTH_INDEX)) == 0) | 1718 | if (XINT (AREF (font, FONT_AVGWIDTH_INDEX)) == 0) |