[Emacs-diffs] /srv/bzr/emacs/trunk r105073: Merge: Fix minor problems found by static checking (Bug#9031).

[Paul Eggert]

------------------------------------------------------------
revno: 105073 [merge]
fixes bug(s): http://debbugs.gnu.org/9031
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-09 22:12:16 -0700
message:
  Merge: Fix minor problems found by static checking (Bug#9031).
modified:
  src/ChangeLog
  src/chartab.c
  src/composite.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-09 13:58:09 +0000
+++ b/src/ChangeLog     2011-07-10 04:58:22 +0000
@@ -1,3 +1,11 @@
+2011-07-10  Paul Eggert  <address@hidden>
+
+       Fix minor problems found by static checking (Bug#9031).
+       * chartab.c (char_table_set_range, map_sub_char_table):
+       Remove unused locals.
+       (uniprop_table): Now static.
+       * composite.c (_work_char): Remove unused static var.
+
 2011-07-09  Juanma Barranquero  <address@hidden>
 
        * chartab.c (uniprop_table_uncompress): Remove unused local variable.

=== modified file 'src/chartab.c'
--- a/src/chartab.c     2011-07-09 13:58:09 +0000
+++ b/src/chartab.c     2011-07-10 04:54:04 +0000
@@ -485,7 +485,6 @@
 char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val)
 {
   struct Lisp_Char_Table *tbl = XCHAR_TABLE (table);
-  Lisp_Object *contents = tbl->contents;
 
   if (from == to)
     char_table_set (table, from, val);
@@ -759,8 +758,6 @@
                    Lisp_Object function, Lisp_Object table, Lisp_Object arg, 
Lisp_Object val,
                    Lisp_Object range, Lisp_Object top)
 {
-  /* Pointer to the elements of TABLE. */
-  Lisp_Object *contents;
   /* Depth of TABLE.  */
   int depth;
   /* Minimum and maxinum characters covered by TABLE. */
@@ -777,14 +774,12 @@
       struct Lisp_Sub_Char_Table *tbl = XSUB_CHAR_TABLE (table);
 
       depth = XINT (tbl->depth);
-      contents = tbl->contents;
       min_char = XINT (tbl->min_char);
       max_char = min_char + chartab_chars[depth - 1] - 1;
     }
   else
     {
       depth = 0;
-      contents = XCHAR_TABLE (table)->contents;
       min_char = 0;
       max_char = MAX_CHAR;
     }
@@ -1315,7 +1310,7 @@
    function may load a Lisp file and thus may cause
    garbage-collection.  */
 
-Lisp_Object
+static Lisp_Object
 uniprop_table (Lisp_Object prop)
 {
   Lisp_Object val, table, result;

=== modified file 'src/composite.c'
--- a/src/composite.c   2011-07-07 16:18:25 +0000
+++ b/src/composite.c   2011-07-09 06:28:40 +0000
@@ -967,7 +967,6 @@
 }
 
 static Lisp_Object _work_val;
-static int _work_char;
 
 /* 1 iff the character C is composable.  Characters of general
    category Z? or C? are not composable except for ZWNJ and ZWJ. */