From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 10 Jun 2011 20:38:18 +0000 (-0700)
Subject: Merge: Fix minor problems found by static checking.
X-Git-Tag: emacs-pretest-24.0.90~104^2~591
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=109e28d0b3eaeaa92ef2030e2ef3b18462702e58;p=emacs.git

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.
---

109e28d0b3eaeaa92ef2030e2ef3b18462702e58
diff --cc src/ChangeLog
index cbb0999d50e,36673a3d079..8b651569acc
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,35 +1,36 @@@
+ 2011-06-10  Paul Eggert  <eggert@cs.ucla.edu>
+ 
++	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: Fix minor problems reported by GCC 4.6.0.
 -	(window_deletion_count, delete_deletable_window): Remove; unused.
++	* 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: Fix minor problems reported by GCC 4.6.0.
 -	(gif_load, svg_load_image): Rename locals to avoid shadowing.
++	* 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.
+ 
  2011-06-10  Chong Yidong  <cyd@stupidchicken.com>
  
  	* image.c (gif_load): Fix omitted cast error introduced by