aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.c
diff options
context:
space:
mode:
authorPaul Eggert2019-07-07 12:29:27 -0700
committerPaul Eggert2019-07-07 12:33:35 -0700
commit8f522efe9a963cd3523ea6863f9bd44881cdf6b7 (patch)
tree10ba28c937e142395bcc4d81580d24fa334e1227 /src/font.c
parentbda8a57141e6cb5455e1246c6ab394791fd6c582 (diff)
downloademacs-8f522efe9a963cd3523ea6863f9bd44881cdf6b7.tar.gz
emacs-8f522efe9a963cd3523ea6863f9bd44881cdf6b7.zip
Remove printmax_t etc.
printmax_t etc. were needed only for platforms that lacked support for printing intmax_t. These platforms are now so obsolete that they are no longer practical porting targets. * src/image.c (gs_load): Fix unlikely buffer overrun discovered while making these changes. It was introduced in 2011-07-17T00:34:43!eggert@cs.ucla.edu. * src/lisp.h (printmax_t, uprintmax_t, pMd, pMu, pMx): Remove. All uses replaced by their standard counterparts intmax_t, uintmax_t, PRIdMAX, PRIuMAX, PRIxMAX.
Diffstat (limited to 'src/font.c')
-rw-r--r--src/font.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/font.c b/src/font.c
index 409ffa6ae0c..b4a85a1ca5a 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1295,14 +1295,12 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
1295 if (INTEGERP (val)) 1295 if (INTEGERP (val))
1296 { 1296 {
1297 intmax_t v; 1297 intmax_t v;
1298 if (! (integer_to_intmax (val, &v) 1298 if (! (integer_to_intmax (val, &v) && 0 < v))
1299 && 0 < v && v <= TYPE_MAXIMUM (uprintmax_t)))
1300 v = pixel_size; 1299 v = pixel_size;
1301 if (v > 0) 1300 if (v > 0)
1302 { 1301 {
1303 uprintmax_t u = v;
1304 f[XLFD_PIXEL_INDEX] = p = font_size_index_buf; 1302 f[XLFD_PIXEL_INDEX] = p = font_size_index_buf;
1305 sprintf (p, "%"pMu"-*", u); 1303 sprintf (p, "%"PRIdMAX"-*", v);
1306 } 1304 }
1307 else 1305 else
1308 f[XLFD_PIXEL_INDEX] = "*-*"; 1306 f[XLFD_PIXEL_INDEX] = "*-*";