From 416cb3150a3445ffd8a23801e95fbe475c235537 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 22 Jan 2025 23:42:13 +0100 Subject: [PATCH] Minor image_error related cleanups * src/image.c (image_create_x_image_and_pixmap_1): Avoid temporary variable by passing the value directly to image_error. (tiff_handler): Prefer image_error to add_to_log for local consistency. (cherry picked from commit d3ada49a37e19d25170bf6322fee70d527055958) --- src/image.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/image.c b/src/image.c index 1db2df736a5..de6955c2a47 100644 --- a/src/image.c +++ b/src/image.c @@ -4140,10 +4140,8 @@ image_create_x_image_and_pixmap_1 (struct frame *f, int width, int height, int d if (*pixmap == NULL) { DWORD err = GetLastError (); - Lisp_Object errcode; /* All system errors are < 10000, so the following is safe. */ - XSETINT (errcode, err); - image_error ("Unable to create bitmap, error code %d", errcode); + image_error ("Unable to create bitmap, error code %d", make_fixnum (err)); image_destroy_x_image (*pimg); *pimg = NULL; return 0; @@ -9400,8 +9398,8 @@ tiff_handler (const char *log_format, const char *title, log entry, it's OK to truncate it. */ char buf[4000]; int len = vsnprintf (buf, sizeof buf, format, ap); - add_to_log (log_format, build_string (title), - make_string (buf, max (0, min (len, sizeof buf - 1)))); + image_error (log_format, build_string (title), + make_string (buf, max (0, min (len, sizeof buf - 1)))); } # undef MINGW_STATIC -- 2.39.5