[Emacs-diffs] /srv/bzr/emacs/trunk r106420: Fix minor problems found by static checking.

[Paul Eggert]

------------------------------------------------------------
revno: 106420
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-18 10:29:29 -0800
message:
  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.
modified:
  src/ChangeLog
  src/dispextern.h
  src/dispnew.c
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-18 16:50:16 +0000
+++ b/src/ChangeLog     2011-11-18 18:29:29 +0000
@@ -1,3 +1,9 @@
+2011-11-18  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs.

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2011-11-18 12:21:42 +0000
+++ b/src/dispextern.h  2011-11-18 18:29:29 +0000
@@ -3127,7 +3127,9 @@
 void w32_reset_fringes (void);
 #endif
 
+#if XASSERTS
 extern unsigned row_hash (struct glyph_row *);
+#endif
 
 /* Defined in image.c */
 

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2011-11-18 12:41:36 +0000
+++ b/src/dispnew.c     2011-11-18 18:29:29 +0000
@@ -431,7 +431,7 @@
 
 #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);

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-11-18 12:21:42 +0000
+++ b/src/xdisp.c       2011-11-18 18:29:29 +0000
@@ -17950,6 +17950,9 @@
 }
 
 /* Compute the hash code for ROW.  */
+#if !XASSERTS
+static
+#endif
 unsigned
 row_hash (struct glyph_row *row)
 {