From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10628 invoked by alias); 29 Jul 2008 02:48:13 -0000 Received: (qmail 10616 invoked by uid 22791); 29 Jul 2008 02:48:12 -0000 X-Spam-Check-By: sourceware.org Received: from bluesmobile.specifix.com (HELO bluesmobile.specifix.com) (216.129.118.140) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 29 Jul 2008 02:47:50 +0000 Received: from [127.0.0.1] (bluesmobile.specifix.com [216.129.118.140]) by bluesmobile.specifix.com (Postfix) with ESMTP id C8EA13C0AC; Mon, 28 Jul 2008 19:47:48 -0700 (PDT) Subject: Re: RFA: clean up edit_command From: Michael Snyder To: Tom Tromey Cc: gdb-patches@sourceware.org In-Reply-To: References: Content-Type: text/plain Date: Tue, 29 Jul 2008 02:48:00 -0000 Message-Id: <1217299668.3549.576.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.10.3 (2.10.3-7.fc7) Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-07/txt/msg00532.txt.bz2 On Mon, 2008-07-28 at 09:50 -0600, Tom Tromey wrote: > I noticed some weird code in edit_command yesterday. > > Ordinarily I do not like to mix code changes and formatting fixes, but > in this case, I think it is warranted... the code change here is just > removing a dead loop. The formatting fixes are the usual: bad brace > style, bad indentation, wrong comment style, spacing missing before > "("... this function had them all :) > > Built and regtested on the GCC compile farm (x86-64). > > Ok? OK, but don't you want to remove cmdlen as well? Doesn't seem to be used any more... > > Tom > > 2008-07-28 Tom Tromey > > * cli/cli-cmds.c (edit_command): Remove unused variables. Delete > dead code. Fix indentation. > > diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c > index 8dc178e..16fbf3d 100644 > --- a/gdb/cli/cli-cmds.c > +++ b/gdb/cli/cli-cmds.c > @@ -615,12 +615,11 @@ edit_command (char *arg, int from_tty) > struct symtab_and_line sal; > struct symbol *sym; > char *arg1; > - int cmdlen, log10; > - unsigned m; > + int cmdlen; > char *editor; > char *p, *fn; > > - /* Pull in the current default source line if necessary */ > + /* Pull in the current default source line if necessary. */ > if (arg == 0) > { > set_default_source_symtab_and_line (); > @@ -638,17 +637,22 @@ edit_command (char *arg, int from_tty) > else > { > > - /* Now should only be one argument -- decode it in SAL */ > + /* Now should only be one argument -- decode it in SAL. */ > > arg1 = arg; > sals = decode_line_1 (&arg1, 0, 0, 0, 0, 0); > > - if (! sals.nelts) return; /* C++ */ > - if (sals.nelts > 1) { > - ambiguous_line_spec (&sals); > - xfree (sals.sals); > - return; > - } > + if (! sals.nelts) > + { > + /* C++ */ > + return; > + } > + if (sals.nelts > 1) > + { > + ambiguous_line_spec (&sals); > + xfree (sals.sals); > + return; > + } > > sal = sals.sals[0]; > xfree (sals.sals); > @@ -656,7 +660,7 @@ edit_command (char *arg, int from_tty) > if (*arg1) > error (_("Junk at end of line specification.")); > > - /* if line was specified by address, > + /* If line was specified by address, > first print exactly which line, and which file. > In this case, sal.symtab == 0 means address is outside > of all known source files, not that user failed to give a filename. */ > @@ -686,10 +690,6 @@ edit_command (char *arg, int from_tty) > if ((editor = (char *) getenv ("EDITOR")) == NULL) > editor = "/bin/ex"; > > - /* Approximate base-10 log of line to 1 unit for digit count */ > - for(log10=32, m=0x80000000; !(sal.line & m) && log10>0; log10--, m=m>>1); > - log10 = 1 + (int)((log10 + (0 == ((m-1) & sal.line)))/3.32192809); > - > /* If we don't already know the full absolute file name of the > source file, find it now. */ > if (!sal.symtab->fullname) > @@ -704,8 +704,8 @@ edit_command (char *arg, int from_tty) > /* Quote the file name, in case it has whitespace or other special > characters. */ > p = xstrprintf ("%s +%d \"%s\"", editor, sal.line, fn); > - shell_escape(p, from_tty); > - xfree(p); > + shell_escape (p, from_tty); > + xfree (p); > } > > static void