From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#9031: Unused vars etc. in chartab.c, composite.c, gtkutil.c Date: Fri, 08 Jul 2011 23:32:24 -0700 Organization: UCLA Computer Science Department Message-ID: <4E17F5F8.7060200@cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1310193444 27044 80.91.229.12 (9 Jul 2011 06:37:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 9 Jul 2011 06:37:24 +0000 (UTC) To: 9031@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jul 09 08:37:20 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QfRAF-0007Wq-JQ for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Jul 2011 08:37:19 +0200 Original-Received: from localhost ([::1]:38929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfRAE-0007oj-QX for geb-bug-gnu-emacs@m.gmane.org; Sat, 09 Jul 2011 02:37:18 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:43875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfRA0-0007oc-01 for bug-gnu-emacs@gnu.org; Sat, 09 Jul 2011 02:37:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfR9y-0005sU-IP for bug-gnu-emacs@gnu.org; Sat, 09 Jul 2011 02:37:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfR9y-0005sO-Er for bug-gnu-emacs@gnu.org; Sat, 09 Jul 2011 02:37:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QfR9x-0005wx-RD; Sat, 09 Jul 2011 02:37:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 09 Jul 2011 06:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 9031 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.131019341022851 (code B ref -1); Sat, 09 Jul 2011 06:37:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 9 Jul 2011 06:36:50 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QfR9l-0005wW-2K for submit@debbugs.gnu.org; Sat, 09 Jul 2011 02:36:49 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QfR9h-0005wJ-UK for submit@debbugs.gnu.org; Sat, 09 Jul 2011 02:36:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfR9a-0005oV-A2 for submit@debbugs.gnu.org; Sat, 09 Jul 2011 02:36:40 -0400 Original-Received: from lists.gnu.org ([140.186.70.17]:43226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfR9Z-0005o9-VP for submit@debbugs.gnu.org; Sat, 09 Jul 2011 02:36:38 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:43758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfR9Y-0007m1-3T for bug-gnu-emacs@gnu.org; Sat, 09 Jul 2011 02:36:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QfR9V-0005nQ-L2 for bug-gnu-emacs@gnu.org; Sat, 09 Jul 2011 02:36:36 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:59385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QfR5X-0005V6-Cu for bug-gnu-emacs@gnu.org; Sat, 09 Jul 2011 02:32:29 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 55F8639E8116 for ; Fri, 8 Jul 2011 23:32:26 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zYeY2a32td6q for ; Fri, 8 Jul 2011 23:32:25 -0700 (PDT) Original-Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 7273C39E80F2 for ; Fri, 8 Jul 2011 23:32:25 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110516 Thunderbird/3.1.10 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sat, 09 Jul 2011 02:37:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:48313 Archived-At: 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: eggert@cs.ucla.edu-20110709062840-jdrk1zrclfflltae # target_branch: bzr+ssh://eggert@bzr.savannah.gnu.org/emacs/trunk # testament_sha1: 935c16305b271d2f38af33043c16de6e23c306ca # timestamp: 2011-07-08 23:28:47 -0700 # base_revision_id: sdl.web@gmail.com-20110709031157-d7vix3jz1gpb29bw # # 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 + 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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