Fix minor problems found by static checking.

* dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS.
* dispnew.c (verify_row_hash): Now static.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1bb4a6a59935a33e20271525e87618010e611225..76986f60c16b953dccb8c70852c88ecce82def85 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix minor problems found by static checking.
+       * dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS.
+       * dispnew.c (verify_row_hash): Now static.
+
 2011-11-18  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

diff --git a/src/dispextern.h b/src/dispextern.h
index 486aa4f7a407c85196f7f6bb0daed0d84ce37eea..48dd374f3c5276ade73d3c65b9ea8b38c10b37bc 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3127,7 +3127,9 @@ void w32_init_fringe (struct redisplay_interface *);
 void w32_reset_fringes (void);
 #endif
 
+#if XASSERTS
 extern unsigned row_hash (struct glyph_row *);
+#endif
 
 /* Defined in image.c */
 

diff --git a/src/dispnew.c b/src/dispnew.c
index d6bf6666ee20e2d93016bf5f8bb33eaac85bce3c..e4868a237d2ab043506368d213dcdd5302a5225b 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -431,7 +431,7 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin
 
 #if XASSERTS
 /* Return non-zero if ROW's hash value is correct, zero if not.  */
-int
+static int
 verify_row_hash (struct glyph_row *row)
 {
   return row->hash == row_hash (row);

diff --git a/src/xdisp.c b/src/xdisp.c
index ae19e11565bb8ceb2d5158aa7e94f9b37cb8221c..65e2c1e4f001a16eee3223da8e496a0d6fab7a98 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17950,6 +17950,9 @@ insert_left_trunc_glyphs (struct it *it)
 }
 
 /* Compute the hash code for ROW.  */
+#if !XASSERTS
+static
+#endif
 unsigned
 row_hash (struct glyph_row *row)
 {