diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-18 10:29:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-18 10:29:29 -0800 |
| commit | 61ccba97a11dd945138a5459955456ebb19b9e74 (patch) | |
| tree | c094aaf4aebe089af28d1024a3a03b3c9ea9550a | |
| parent | 2071918ec9a1562d5f0aa6218d98f80318a33466 (diff) | |
| download | emacs-61ccba97a11dd945138a5459955456ebb19b9e74.tar.gz | |
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.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/dispextern.h | 2 | ||||
| -rw-r--r-- | src/dispnew.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1bb4a6a5993..76986f60c16 100644 --- 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 486aa4f7a40..48dd374f3c5 100644 --- 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 d6bf6666ee2..e4868a237d2 100644 --- 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 ae19e11565b..65e2c1e4f00 100644 --- 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) { |