diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-08 13:04:40 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-08 13:04:40 -0700 |
| commit | 3b158d1150cbbffc77afef323008623ac5c3e169 (patch) | |
| tree | 41f4cf689afbcc23831c56d5556a1ab46db88d46 /src/dispnew.c | |
| parent | c7a7f318ff5593331341d05a762a765f52e6bdd2 (diff) | |
Fix minor problems found by static checking.
* dispnew.c (save_current_matrix): Omit unnecessary casts.
* dispnew.c (update_frame_with_menu): Mark debug local as used.
* keyboard.c, keyboard.h (Qmouse_movement): Now static.
* keyboard.c (read_menu_command): Remove unused local.
* lisp.h (read_menu_command): New decl.
* menu.c, menu.h (menu_item_width): Arg is now unsigned char *, for
benefit of STRING_CHAR_AND_LENGTH. All uses changed.
Return ptrdiff_t, not int.
* term.c (tty_menu_struct): 'allocated' member is now ptrdiff_t,
not int, for benefit of xpalloc.
(tty_menu_create, tty_menu_make_room): Simplify by using xzalloc
and xpalloc.
(have_menus_p): Remove; unused.
(tty_menu_add_pane, tty_menu_add_selection): Change signedness of
local char * pointer to pacify STRING_CHAR_AND_LENGTH.
(tty_menu_add_selection, tty_menu_locate, tty_meny_destroy):
Now static.
(save_and_enable_current_matrix): Omit unnecessary casts.
(read_menu_input): Omit local extern decl (now in lisp.h).
Don't access uninitialized storage if mouse_get_xy fails.
(tty_menu_activate): Mark local as initialized, for lint.
(tty_menu_activate, tty_meny_show): Remove unused locals.
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index f5d213e03f..f5adb359f2 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -1853,7 +1853,7 @@ save_current_matrix (struct frame *f) if (from->used[LEFT_MARGIN_AREA]) { nbytes = from->used[LEFT_MARGIN_AREA] * sizeof (struct glyph); - to->glyphs[LEFT_MARGIN_AREA] = (struct glyph *) xmalloc (nbytes); + to->glyphs[LEFT_MARGIN_AREA] = xmalloc (nbytes); memcpy (to->glyphs[LEFT_MARGIN_AREA], from->glyphs[LEFT_MARGIN_AREA], nbytes); to->used[LEFT_MARGIN_AREA] = from->used[LEFT_MARGIN_AREA]; @@ -1861,7 +1861,7 @@ save_current_matrix (struct frame *f) if (from->used[RIGHT_MARGIN_AREA]) { nbytes = from->used[RIGHT_MARGIN_AREA] * sizeof (struct glyph); - to->glyphs[RIGHT_MARGIN_AREA] = (struct glyph *) xmalloc (nbytes); + to->glyphs[RIGHT_MARGIN_AREA] = xmalloc (nbytes); memcpy (to->glyphs[RIGHT_MARGIN_AREA], from->glyphs[RIGHT_MARGIN_AREA], nbytes); to->used[RIGHT_MARGIN_AREA] = from->used[RIGHT_MARGIN_AREA]; @@ -3123,6 +3123,8 @@ update_frame_with_menu (struct frame *f) check_window_matrix_pointers (root_window); #endif add_frame_display_history (f, paused_p); +#else + IF_LINT ((void) paused_p); #endif /* Reset flags indicating that a window should be updated. */ |