bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#9031: Unused vars etc. in chartab.c, composite.c, gtkutil.c


From: Paul Eggert
Subject: bug#9031: Unused vars etc. in chartab.c, composite.c, gtkutil.c
Date: Fri, 08 Jul 2011 23:32:24 -0700
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110516 Thunderbird/3.1.10

This patch fixes some minor problems on the Emacs trunk.

Normally I'd just install this, but we're in a feature freeze
now and this patch doesn't fix any actual bugs, so I'm filing
a bug report instead, to record the issues.

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: bzr+ssh://address@hidden/emacs/trunk
# testament_sha1: 935c16305b271d2f38af33043c16de6e23c306ca
# timestamp: 2011-07-08 23:28:47 -0700
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'src/ChangeLog'
--- src/ChangeLog       2011-07-08 20:39:30 +0000
+++ src/ChangeLog       2011-07-09 06:28:40 +0000
@@ -1,5 +1,12 @@
 2011-07-08  Paul Eggert  <address@hidden>
 
+       Fix minor problems found by static checking.
+       * chartab.c (char_table_set_range, map_sub_char_table)
+       (uniprop_table_uncompress): Remove unused locals.
+       (uniprop_table): Now static.
+       * composite.c (_work_char): Remove unused static var.
+       * gtkutil.c (qttip_cb): Remove stray no-effect statement.
+
        Use pthread_sigmask, not sigprocmask (Bug#9010).
        sigprocmask is portable only for single-threaded applications, and
        Emacs can be multi-threaded when it uses GTK.

=== modified file 'src/chartab.c'
--- src/chartab.c       2011-07-07 04:16:52 +0000
+++ src/chartab.c       2011-07-09 06:28:40 +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;
     }
@@ -1143,7 +1138,6 @@
   Lisp_Object sub = make_sub_char_table (3, min_char, Qnil);
   struct Lisp_Sub_Char_Table *subtbl = XSUB_CHAR_TABLE (sub);
   const unsigned char *p, *pend;
-  int i;
 
   XSUB_CHAR_TABLE (table)->contents[idx] = sub;
   p = SDATA (val), pend = p + SBYTES (val);
@@ -1316,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'
--- src/composite.c     2011-07-07 16:18:25 +0000
+++ 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. */

=== modified file 'src/gtkutil.c'
--- src/gtkutil.c       2011-07-08 17:57:55 +0000
+++ src/gtkutil.c       2011-07-09 06:28:40 +0000
@@ -647,7 +647,6 @@
       /* Change stupid Gtk+ default line wrapping.  */
       p = gtk_widget_get_parent (x->ttip_lbl);
       list = gtk_container_get_children (GTK_CONTAINER (p));
-      iter;
       for (iter = list; iter; iter = g_list_next (iter))
         {
           GtkWidget *w = GTK_WIDGET (iter->data);

# Begin bundle
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





reply via email to

[Prev in Thread] Current Thread [Next in Thread]