Mercurial > emacs
comparison src/font.c @ 100126:dcdbc6ad9e02
(font_unparse_fcname): Fix use of uninitialized variable.
author | Andreas Schwab <schwab@suse.de> |
---|---|
date | Tue, 02 Dec 2008 22:47:20 +0000 |
parents | c2ef1c8b2d64 |
children | 7add351b47c9 |
comparison
equal
deleted
inserted
replaced
100125:e41ac6b691bb | 100126:dcdbc6ad9e02 |
---|---|
1596 int nbytes; | 1596 int nbytes; |
1597 { | 1597 { |
1598 Lisp_Object family, foundry; | 1598 Lisp_Object family, foundry; |
1599 Lisp_Object tail, val; | 1599 Lisp_Object tail, val; |
1600 int point_size; | 1600 int point_size; |
1601 int dpi; | |
1602 int i, len = 1; | 1601 int i, len = 1; |
1603 char *p; | 1602 char *p; |
1604 Lisp_Object styles[3]; | 1603 Lisp_Object styles[3]; |
1605 char *style_names[3] = { "weight", "slant", "width" }; | 1604 char *style_names[3] = { "weight", "slant", "width" }; |
1606 char work[256]; | 1605 char work[256]; |
1651 len += sprintf (work, ":%s=%s", style_names[i], | 1650 len += sprintf (work, ":%s=%s", style_names[i], |
1652 SDATA (SYMBOL_NAME (styles[i]))); | 1651 SDATA (SYMBOL_NAME (styles[i]))); |
1653 } | 1652 } |
1654 | 1653 |
1655 if (INTEGERP (AREF (font, FONT_DPI_INDEX))) | 1654 if (INTEGERP (AREF (font, FONT_DPI_INDEX))) |
1656 len += sprintf (work, ":dpi=%d", dpi); | 1655 len += sprintf (work, ":dpi=%d", XINT (AREF (font, FONT_DPI_INDEX))); |
1657 if (INTEGERP (AREF (font, FONT_SPACING_INDEX))) | 1656 if (INTEGERP (AREF (font, FONT_SPACING_INDEX))) |
1658 len += strlen (":spacing=100"); | 1657 len += strlen (":spacing=100"); |
1659 if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) | 1658 if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX))) |
1660 len += strlen (":scalable=false"); /* or ":scalable=true" */ | 1659 len += strlen (":scalable=false"); /* or ":scalable=true" */ |
1661 for (tail = AREF (font, FONT_EXTRA_INDEX); CONSP (tail); tail = XCDR (tail)) | 1660 for (tail = AREF (font, FONT_EXTRA_INDEX); CONSP (tail); tail = XCDR (tail)) |