diff options
| author | Tom Tromey <tromey@redhat.com> | 2008-07-30 01:08:35 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2008-07-30 01:08:35 +0000 |
| commit | d5529a849eb02c5aaea8ad808aa18a5d33089df0 (patch) | |
| tree | 67a0da73baea2b1f4d3dbead945def7c9e1985ad /gdb | |
| parent | baea00a6336f2b96908092067f0084783c898643 (diff) | |
| download | gdb-d5529a849eb02c5aaea8ad808aa18a5d33089df0.zip gdb-d5529a849eb02c5aaea8ad808aa18a5d33089df0.tar.gz gdb-d5529a849eb02c5aaea8ad808aa18a5d33089df0.tar.bz2 | |
* cli/cli-cmds.c (edit_command): Remove unused variables. Delete
dead code. Fix indentation.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 33 |
2 files changed, 21 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ec170a4..3267a30 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2008-07-29 Tom Tromey <tromey@redhat.com> + + * cli/cli-cmds.c (edit_command): Remove unused variables. Delete + dead code. Fix indentation. + 2008-07-29 Stan Shebs <stan@codesourcery.com> * main.c (captured_main): Remove long-unused #if 0 blocks. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 8dc178e..d9d2c56 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -615,12 +615,10 @@ edit_command (char *arg, int from_tty) struct symtab_and_line sal; struct symbol *sym; char *arg1; - int cmdlen, log10; - unsigned m; 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 +636,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 +659,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 +689,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 +703,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 |