From 9c88f339493465e8e200b21885f2ac886b299169 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 23 Mar 2011 17:25:38 +0100 Subject: [PATCH] w32: Fix some warnings reported by -Wall -Wextra. * lib-src/ntlib.c: Include . * nt/cmdproxy.c: Include . (make_absolute): Remove unused variable `i'. * src/w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'. (w32_wnd_proc): Pass NULL to Windows API, not uninitialized buffer. (Fx_close_connection): Remove unused variable `i'. * src/w32font.c (w32font_draw): Return number of glyphs. (w32font_open_internal): Remove unused variable `i'. (w32font_driver): Add missing initializer. * src/w32menu.c (utf8to16): Remove unused variable `utf16'. (fill_in_menu): Remove unused variable `items_added'. * src/w32term.c (last_mouse_press_frame): Remove static global variable. (w32_clip_to_row): Remove unused variable `f'. (x_delete_terminal): Remove unused variable `i'. * src/w32uniscribe.c (uniscribe_shape): Remove unused variable `nclusters'. (NOTHING): Remove unused static global variable. (uniscribe_check_otf): Remove unused variable `table'. (uniscribe_font_driver): Add missing initializers. --- lib-src/ChangeLog | 4 ++++ lib-src/ntlib.c | 1 + nt/ChangeLog | 5 +++++ nt/cmdproxy.c | 2 +- src/ChangeLog | 22 ++++++++++++++++++++++ src/w32fns.c | 4 +--- src/w32font.c | 10 +++++++--- src/w32menu.c | 3 --- src/w32term.c | 3 --- src/w32uniscribe.c | 11 ++++++----- 10 files changed, 47 insertions(+), 18 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0e46a83aaf..672fe8c854 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-03-23 Juanma Barranquero + + * ntlib.c: Include . + 2011-03-23 Glenn Morris * Makefile.in ($(DESTDIR)${archlibdir}): diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index 0ecd4177d2..83f653f3ea 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c @@ -28,6 +28,7 @@ along with GNU Emacs. If not, see . #include #include #include +#include #include "ntlib.h" diff --git a/nt/ChangeLog b/nt/ChangeLog index e55fc52a48..657b4c7a10 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2011-03-23 Juanma Barranquero + + * cmdproxy.c: Include . + (make_absolute): Remove unused variable `i'. + 2011-02-27 Eli Zaretskii * inc/unistd.h (readlink, symlink): Declare prototypes. diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 9a98e1e503..b9572570c5 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -33,6 +33,7 @@ along with GNU Emacs. If not, see . */ #include /* alloca */ #include /* getenv */ #include /* strlen */ +#include /* isspace, isalpha */ /* We don't want to include stdio.h because we are already duplicating lots of it here */ @@ -251,7 +252,6 @@ make_absolute (const char *prog) char curdir[MAX_PATH]; char *p, *path; const char *fname; - int i; /* At least partial absolute path specified; search there. */ if ((isalpha (prog[0]) && prog[1] == ':') || diff --git a/src/ChangeLog b/src/ChangeLog index f976611504..b306ff78ff 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,25 @@ +2011-03-23 Juanma Barranquero + + * w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'. + (w32_wnd_proc): Pass NULL to Windows API, not uninitialized buffer. + (Fx_close_connection): Remove unused variable `i'. + + * w32font.c (w32font_draw): Return number of glyphs. + (w32font_open_internal): Remove unused variable `i'. + (w32font_driver): Add missing initializer. + + * w32menu.c (utf8to16): Remove unused variable `utf16'. + (fill_in_menu): Remove unused variable `items_added'. + + * w32term.c (last_mouse_press_frame): Remove static global variable. + (w32_clip_to_row): Remove unused variable `f'. + (x_delete_terminal): Remove unused variable `i'. + + * w32uniscribe.c (uniscribe_shape): Remove unused variable `nclusters'. + (NOTHING): Remove unused static global variable. + (uniscribe_check_otf): Remove unused variable `table'. + (uniscribe_font_driver): Add missing initializers. + 2011-03-23 Julien Danjou * term.c (Fsuspend_tty, Fresume_tty): diff --git a/src/w32fns.c b/src/w32fns.c index 0c899cdcef..d833f9d550 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1527,7 +1527,6 @@ void x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; - int olines = FRAME_MENU_BAR_LINES (f); /* Right now, menu bars don't work properly in minibuf-only frames; most of the commands try to apply themselves to the minibuffer @@ -2951,7 +2950,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) HIMC context = get_ime_context_fn (hwnd); wmsg.dwModifiers = w32_get_key_modifiers (wParam, lParam); /* Get buffer size. */ - size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, 0); + size = get_composition_string_fn (context, GCS_RESULTSTR, NULL, 0); buffer = alloca (size); size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, size); @@ -4820,7 +4819,6 @@ If DISPLAY is nil, that stands for the selected frame's display. */) (Lisp_Object display) { struct w32_display_info *dpyinfo = check_x_display_info (display); - int i; if (dpyinfo->reference_count > 0) error ("Display still has frames on it"); diff --git a/src/w32font.c b/src/w32font.c index 40ff0782b8..d86107bc6d 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -533,6 +533,7 @@ w32font_draw (struct glyph_string *s, int from, int to, { UINT options; HRGN orig_clip = NULL; + int len = to - from; struct w32font_info *w32font = (struct w32font_info *) s->font; options = w32font->glyph_idx; @@ -581,14 +582,14 @@ w32font_draw (struct glyph_string *s, int from, int to, if (s->padding_p) { - int len = to - from, i; + int i; for (i = 0; i < len; i++) ExtTextOutW (s->hdc, x + i, y, options, NULL, s->char2b + from + i, 1, NULL); } else - ExtTextOutW (s->hdc, x, y, options, NULL, s->char2b + from, to - from, NULL); + ExtTextOutW (s->hdc, x, y, options, NULL, s->char2b + from, len, NULL); /* Restore clip region. */ if (s->num_clips > 0) @@ -596,6 +597,8 @@ w32font_draw (struct glyph_string *s, int from, int to, if (orig_clip) DeleteObject (orig_clip); + + return len; } /* w32 implementation of free_entity for font backend. @@ -774,7 +777,7 @@ int w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity, int pixel_size, Lisp_Object font_object) { - int len, size, i; + int len, size; LOGFONT logfont; HDC dc; HFONT hfont, old_font; @@ -2418,6 +2421,7 @@ struct font_driver w32font_driver = NULL, /* check */ NULL, /* get_variation_glyphs */ w32font_filter_properties, + NULL, /* cached_font_ok */ }; diff --git a/src/w32menu.c b/src/w32menu.c index a2e62f24f6..c363fdd72c 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1320,7 +1320,6 @@ utf8to16 (unsigned char * src, int len, WCHAR * dest) { while (len > 0) { - int utf16; if (*src < 0x80) { *dest = (WCHAR) *src; @@ -1546,8 +1545,6 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) static int fill_in_menu (HMENU menu, widget_value *wv) { - int items_added = 0; - for ( ; wv != NULL; wv = wv->next) { if (wv->contents) diff --git a/src/w32term.c b/src/w32term.c index f31c4e90e7..56454faddb 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -160,7 +160,6 @@ int last_scroll_bar_drag_pos; /* Where the mouse was last time we reported a mouse event. */ static RECT last_mouse_glyph; static FRAME_PTR last_mouse_glyph_frame; -static Lisp_Object last_mouse_press_frame; /* The scroll bar in which the last motion event occurred. @@ -4842,7 +4841,6 @@ w32_read_socket (struct terminal *terminal, int expected, static void w32_clip_to_row (struct window *w, struct glyph_row *row, int area, HDC hdc) { - struct frame *f = XFRAME (WINDOW_FRAME (w)); RECT clip_rect; int window_x, window_y, window_width; @@ -6089,7 +6087,6 @@ static void x_delete_terminal (struct terminal *terminal) { struct w32_display_info *dpyinfo = terminal->display_info.w32; - int i; /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index 39d1ee5c85..f6347bb88f 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -320,7 +320,7 @@ uniscribe_shape (Lisp_Object lgstring) } if (SUCCEEDED (result)) { - int j, nclusters, from, to; + int j, from, to; from = 0; to = from; @@ -629,8 +629,6 @@ add_opentype_font_name_to_list (ENUMLOGFONTEX *logical_font, STR[4] = '\0'; \ } while (0) -static char* NOTHING = " "; - #define SNAME(VAL) SDATA (SYMBOL_NAME (VAL)) /* Check if font supports the otf script/language/features specified. @@ -646,7 +644,6 @@ uniscribe_check_otf (LOGFONT *font, Lisp_Object otf_spec) struct frame * f; HDC context; HFONT check_font, old_font; - DWORD table; int i, retval = 0; struct gcpro gcpro1; @@ -936,7 +933,11 @@ struct font_driver uniscribe_font_driver = NULL, /* otf_drive - use shape instead. */ NULL, /* start_for_frame */ NULL, /* end_for_frame */ - uniscribe_shape + uniscribe_shape, + NULL, /* check */ + NULL, /* get_variation_glyphs */ + NULL, /* filter_properties */ + NULL, /* cached_font_ok */ }; /* Note that this should be called at every startup, not just when dumping, -- 2.20.1