Merge: Fix minor problems found by static checking.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 20:38:18 +0000 (13:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Jun 2011 20:38:18 +0000 (13:38 -0700)
commit109e28d0b3eaeaa92ef2030e2ef3b18462702e58
tree053e1c745c02f4ad659484ab80e0480f75465d35
parent529a133c390049085db38e7c8f745d650a2626ee
parent60737f02aa2e76f7d1183158fa8d0a7d4aa89f64
Merge: Fix minor problems found by static checking.

* image.c (PixelGetMagickColor): Declare if ImageMagick headers don't.

Make identifiers static if they are not used in other modules.
* data.c (Qcompiled_function, Qframe, Qvector):
* image.c (QimageMagick, Qsvg):
* minibuf.c (Qmetadata):
* window.c (resize_window_check, resize_root_window): Now static.
* window.h (resize_window_check, resize_root_window): Remove decls.

* window.c (window_deletion_count, delete_deletable_window):
Remove; unused.
(window_body_lines): Now static.
(Fdelete_other_windows_internal): Mark vars as initialized.
Make sure 'resize_failed' is initialized.
(run_window_configuration_change_hook): Rename local to avoid shadowing.
(resize_window_apply): Remove unused local.
* window.h (delete_deletable_window): Remove decl.

* image.c (gif_load, svg_load_image): Rename locals to avoid shadowing.
(imagemagick_load_image): Fix pointer signedness problem by changing
last arg from unsigned char * to char *.  All uses changed.
Also, fix a local for similar reasons.
Remove unused locals.  Remove locals to avoid shadowing.
(fn_rsvg_handle_free): Remove; unused.
(svg_load, svg_load_image): Fix pointer signedness problem.
(imagemagick_load_image): Don't use garbage pointer image_wand.

* ftfont.c (ftfont_get_metrics, ftfont_drive_otf): Remove unused locals.
src/ChangeLog