Fix minor problems found by static checking.

* bidi.c (bidi_cache_size): Now EMACS_INT, not size_t.
(elsz): Now a signed constant, not a size_t var.  We prefer signed
types to unsigned, to avoid integer comparison confusion.  Without
this change, GCC 4.6.1 with -Wunsafe-loop-optimizations complains
"cannot optimize loop, the loop counter may overflow", a symptom
of the confusion.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3cdb3610dd0ffd42f3a41268fa5122bff060c267..625a0b7925c8ccf14b2a4e8344d3243c4d48dd46 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2011-07-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       Fix minor problems found by static checking.
+       * bidi.c (bidi_cache_size): Now EMACS_INT, not size_t.
+       (elsz): Now a signed constant, not a size_t var.  We prefer signed
+       types to unsigned, to avoid integer comparison confusion.  Without
+       this change, GCC 4.6.1 with -Wunsafe-loop-optimizations complains
+       "cannot optimize loop, the loop counter may overflow", a symptom
+       of the confusion.
        * indent.c (Fvertical_motion): Mark locals as initialized.
        * xdisp.c (reseat_to_string): Fix pointer signedness issue.
 

diff --git a/src/bidi.c b/src/bidi.c
index 22a5f0829cde62fb56d91518c8ab772a87e2951b..c83ee5499239c37a54b37f01c0272206503286b6 100644 (file)
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -299,8 +299,8 @@ bidi_copy_it (struct bidi_it *to, struct bidi_it *from)
 
 #define BIDI_CACHE_CHUNK 200
 static struct bidi_it *bidi_cache;
-static size_t bidi_cache_size = 0;
-static size_t elsz = sizeof (struct bidi_it);
+static EMACS_INT bidi_cache_size = 0;
+enum { elsz = sizeof (struct bidi_it) };
 static EMACS_INT bidi_cache_idx;       /* next unused cache slot */
 static EMACS_INT bidi_cache_last_idx;  /* slot of last cache hit */
 static EMACS_INT bidi_cache_start = 0; /* start of cache for this