Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Keith Seitz <keiths@redhat.com>
To: "gdb-patches@sourceware.org ml" <gdb-patches@sourceware.org>
Subject: [RFC] Cleanup for make_source_files_completion_list
Date: Tue, 07 May 2013 19:46:00 -0000	[thread overview]
Message-ID: <51895A2F.8000504@redhat.com> (raw)

Hi,

make_source_files_completion_list is only ever called with the first 
parameter twice, e.g.,

   fn_list = make_source_files_completion_list (text, text);

Is there any reason to not whack the second parameter as the following 
patch does?

Keith

ChangeLog
2013-05-07  Keith Seitz  <keiths@redhat.com>

	* symtab.h (make_source_files_completion_list): Remove unused
	second parameter.
	* completer.c (location_completer): Update call to
	make_source_files_completion_list.
	* symtab.c (maybe_add_partial_symtab_filename): Likewise.
	(make_source_files_completion_list): Remove unused second
	parameter.
	Pass text to add_filename_to_list instead of word.
	Set datum.word to text, too.

diff --git a/gdb/symtab.h b/gdb/symtab.h
index c735e16..8703f77 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1241,8 +1241,7 @@ extern VEC (char_ptr) 
*make_file_symbol_completion_list (const char *,
  							 const char *,
  							 const char *);

-extern VEC (char_ptr) *make_source_files_completion_list (const char *,
-							  const char *);
+extern VEC (char_ptr) *make_source_files_completion_list (const char *);

  /* symtab.c */

diff --git a/gdb/completer.c b/gdb/completer.c
index e132651..b4845cb 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -270,7 +270,7 @@ location_completer (struct cmd_list_element *ignore,
  	 name, they cannot be asking for completion on files.  */
        if (strcspn (text,
  		   gdb_completer_file_name_break_characters) == text_len)
-	fn_list = make_source_files_completion_list (text, text);
+	fn_list = make_source_files_completion_list (text);
      }

    n_syms = VEC_length (char_ptr, list);
diff --git a/gdb/symtab.c b/gdb/symtab.c
index def556b..201fa82 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -4682,7 +4682,7 @@ maybe_add_partial_symtab_filename (const char 
*filename, const char *fullname,
     NULL.  */

  VEC (char_ptr) *
-make_source_files_completion_list (const char *text, const char *word)
+make_source_files_completion_list (const char *text)
  {
    struct symtab *s;
    struct objfile *objfile;
@@ -4711,7 +4711,7 @@ make_source_files_completion_list (const char 
*text, const char *word)
  	{
  	  /* This file matches for a completion; add it to the current
  	     list of matches.  */
-	  add_filename_to_list (s->filename, text, word, &list);
+	  add_filename_to_list (s->filename, text, text, &list);
  	}
        else
  	{
@@ -4723,13 +4723,13 @@ make_source_files_completion_list (const char 
*text, const char *word)
  	  if (base_name != s->filename
  	      && !filename_seen (filename_seen_cache, base_name, 1)
  	      && filename_ncmp (base_name, text, text_len) == 0)
-	    add_filename_to_list (base_name, text, word, &list);
+	    add_filename_to_list (base_name, text, text, &list);
  	}
      }

    datum.filename_seen_cache = filename_seen_cache;
    datum.text = text;
-  datum.word = word;
+  datum.word = text;
    datum.text_len = text_len;
    datum.list = &list;
    map_partial_symbol_filenames (maybe_add_partial_symtab_filename, &datum,


             reply	other threads:[~2013-05-07 19:46 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-07 19:46 Keith Seitz [this message]
2013-05-09 20:58 ` Tom Tromey
2013-05-09 23:45 ` Doug Evans
2013-05-13 18:42   ` Keith Seitz
2013-05-13 21:11     ` Keith Seitz
2013-05-15 17:36       ` Keith Seitz
2013-05-15 19:32         ` [RFA] completer test [was Re: [RFC] Cleanup for make_source_files_completion_list] Keith Seitz
2013-05-15 20:01           ` Tom Tromey
2013-05-15 21:22             ` Keith Seitz
2013-05-15 22:33           ` Sergio Durigan Junior
2013-05-15 23:47             ` Keith Seitz
2013-05-16  0:21               ` Sergio Durigan Junior
2013-05-16  0:27               ` Stan Shebs
2013-05-16  9:38                 ` Pedro Alves
2013-05-16  5:30               ` Joel Brobecker
2013-05-16  5:49                 ` Joel Brobecker
2013-05-16 15:41                   ` Keith Seitz
2013-05-17  5:14                     ` Joel Brobecker
2013-05-17 16:27                       ` Tom Tromey
2013-05-20  5:28                         ` Joel Brobecker
2013-05-20 14:47                           ` Tom Tromey
2013-05-21  5:43                             ` Checked in: " Joel Brobecker
2013-05-21  5:44                               ` Joel Brobecker
2013-05-16  5:53                 ` Sergio Durigan Junior
2013-05-16  6:00                   ` Joel Brobecker
2013-05-16  9:19               ` Pedro Alves
2013-05-16  9:26                 ` Joel Brobecker
2013-05-16 10:18                   ` Pedro Alves

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51895A2F.8000504@redhat.com \
    --to=keiths@redhat.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox