diff options
| author | Andreas Schwab | 2008-12-02 22:47:20 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-12-02 22:47:20 +0000 |
| commit | f7741ce9a0bc60a6c7d538e405122602f282b79d (patch) | |
| tree | 583cd2f2ce75d13da5ef45fa79ec606b8d326ea0 /src | |
| parent | 1f625c6cd62bbf9f63d03f027a4a0214a895f28e (diff) | |
| download | emacs-f7741ce9a0bc60a6c7d538e405122602f282b79d.tar.gz emacs-f7741ce9a0bc60a6c7d538e405122602f282b79d.zip | |
(font_unparse_fcname): Fix use of uninitialized variable.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/font.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c7e9a9cc457..8a4f81dd845 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-12-02 Andreas Schwab <schwab@suse.de> | 1 | 2008-12-02 Andreas Schwab <schwab@suse.de> |
| 2 | 2 | ||
| 3 | * font.c (font_unparse_fcname): Fix use of uninitialized variable. | ||
| 4 | |||
| 3 | * doprnt.c (doprnt1): Fix size of charbuf. | 5 | * doprnt.c (doprnt1): Fix size of charbuf. |
| 4 | 6 | ||
| 5 | 2008-12-02 Chong Yidong <cyd@stupidchicken.com> | 7 | 2008-12-02 Chong Yidong <cyd@stupidchicken.com> |
diff --git a/src/font.c b/src/font.c index ccac5af3fd8..ce7091313f6 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1598,7 +1598,6 @@ font_unparse_fcname (font, pixel_size, name, nbytes) | |||
| 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]; |
| @@ -1653,7 +1652,7 @@ font_unparse_fcname (font, pixel_size, name, nbytes) | |||
| 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))) |