From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jim Meyering Newsgroups: gmane.emacs.bugs Subject: bug#11375: [PATCH] simplify/clarify xfns.c, replacing 4 lines with one Date: Sun, 29 Apr 2012 00:02:03 +0200 Message-ID: <87ehr7ms6c.fsf@rho.meyering.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1335650583 32138 80.91.229.3 (28 Apr 2012 22:03:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 28 Apr 2012 22:03:03 +0000 (UTC) To: 11375@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Apr 29 00:03:02 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SOFjJ-0000yo-Ov for geb-bug-gnu-emacs@m.gmane.org; Sun, 29 Apr 2012 00:03:02 +0200 Original-Received: from localhost ([::1]:54925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOFjJ-0006gk-5d for geb-bug-gnu-emacs@m.gmane.org; Sat, 28 Apr 2012 18:03:01 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOFjG-0006gU-C9 for bug-gnu-emacs@gnu.org; Sat, 28 Apr 2012 18:02:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SOFjE-0001BM-33 for bug-gnu-emacs@gnu.org; Sat, 28 Apr 2012 18:02:57 -0400 Original-Received: from [140.186.70.43] (port=56189 helo=debbugs.gnu.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOFjE-00018O-0Q for bug-gnu-emacs@gnu.org; Sat, 28 Apr 2012 18:02:56 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SOFkH-0001bs-LQ for bug-gnu-emacs@gnu.org; Sat, 28 Apr 2012 18:04:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Meyering Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 28 Apr 2012 22:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11375 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.13356506136114 (code B ref -1); Sat, 28 Apr 2012 22:04:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 28 Apr 2012 22:03:33 +0000 Original-Received: from localhost ([127.0.0.1]:57216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SOFjo-0001aZ-Ui for submit@debbugs.gnu.org; Sat, 28 Apr 2012 18:03:33 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:59035) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SOFjm-0001aM-GF for submit@debbugs.gnu.org; Sat, 28 Apr 2012 18:03:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SOFiV-0000wO-VV for submit@debbugs.gnu.org; Sat, 28 Apr 2012 18:02:13 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:36212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOFiV-0000wK-SU for submit@debbugs.gnu.org; Sat, 28 Apr 2012 18:02:11 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOFiU-0006bV-Ae for bug-gnu-emacs@gnu.org; Sat, 28 Apr 2012 18:02:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SOFiS-0000w5-Lt for bug-gnu-emacs@gnu.org; Sat, 28 Apr 2012 18:02:09 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:33661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOFiS-0000w0-IV for bug-gnu-emacs@gnu.org; Sat, 28 Apr 2012 18:02:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:54128) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1SOFiR-0005SE-Ut for bug-emacs@gnu.org; Sat, 28 Apr 2012 18:02:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SOFiP-0000vd-HJ for bug-emacs@gnu.org; Sat, 28 Apr 2012 18:02:07 -0400 Original-Received: from mx.meyering.net ([88.168.87.75]:54336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SOFiP-0000vF-6T for bug-emacs@gnu.org; Sat, 28 Apr 2012 18:02:05 -0400 Original-Received: from rho.meyering.net (localhost.localdomain [127.0.0.1]) by rho.meyering.net (Acme Bit-Twister) with ESMTP id 92D356025C for ; Sun, 29 Apr 2012 00:02:03 +0200 (CEST) Original-Lines: 39 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:59609 Archived-At: 2012-04-28 Jim Meyering simplify/clarify xfns.c, replacing 4 lines with one * src/xfns.c (x_window): Replace strlen+xmalloc+strncpy with xstrdup. --- src/xfns.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 6f08ada..f7a80ce 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2439,7 +2439,6 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only) /* Do some needed geometry management. */ { - ptrdiff_t len; char *tem, shell_position[sizeof "=x++" + 4 * INT_STRLEN_BOUND (int)]; Arg gal[10]; int gac = 0; @@ -2508,13 +2507,11 @@ x_window (struct frame *f, long window_prompting, int minibuffer_only) } } - len = strlen (shell_position) + 1; /* We don't free this because we don't know whether it is safe to free it while the frame exists. It isn't worth the trouble of arranging to free it when the frame is deleted. */ - tem = (char *) xmalloc (len); - strncpy (tem, shell_position, len); + tem = (char *) xstrdup (shell_position); XtSetArg (gal[gac], XtNgeometry, tem); gac++; XtSetValues (shell_widget, gal, gac); } -- 1.7.10.382.g62bc8