From 9b207e8ed2426e4972794e82e9a61aa77401846d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 2 Jan 2001 14:12:28 +0000 Subject: [PATCH] (x_display_info_for_name): Cast 0 to "char *" in the call to x_term_init. (lookup_image): Remove unused variable `file'. (xbm_load): Remove unused variables `bitmap_data', `height', and `width'. Remove function-local variable `i', leave the block-local one. (gif_load): Remove unused variable `inc'. --- src/xfns.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index b52f7fef7c0..dccd380b2e8 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5021,7 +5021,7 @@ x_display_info_for_name (name) validate_x_resource_name (); - dpyinfo = x_term_init (name, (unsigned char *)0, + dpyinfo = x_term_init (name, (char *)0, (char *) XSTRING (Vx_resource_name)->data); if (dpyinfo == 0) @@ -5953,7 +5953,6 @@ lookup_image (f, spec) /* Handle image type independent image attributes `:ascent ASCENT', `:margin MARGIN', `:relief RELIEF'. */ Lisp_Object ascent, margin, relief; - Lisp_Object file; ascent = image_spec_value (spec, QCascent, NULL); if (INTEGERP (ascent)) @@ -6836,12 +6835,11 @@ xbm_load (f, img) { struct image_keyword fmt[XBM_LAST]; Lisp_Object data; - unsigned char *bitmap_data; int depth; unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); unsigned long background = FRAME_BACKGROUND_PIXEL (f); char *bits; - int parsed_p, height, width; + int parsed_p; int in_memory_file_p = 0; /* See if data looks like an in-memory XBM file. */ @@ -7232,7 +7230,7 @@ xpm_load (f, img) struct frame *f; struct image *img; { - int rc, i; + int rc; XpmAttributes attrs; Lisp_Object specified_file, color_symbols; @@ -9746,7 +9744,7 @@ gif_load (f, img) { static int interlace_start[] = {0, 4, 2, 1}; static int interlace_increment[] = {8, 8, 4, 2}; - int pass, inc; + int pass; int row = interlace_start[0]; pass = 0; -- 2.39.5