PR binutils/1437

[deliverable/binutils-gdb.git] / gdb / source.c

diff --git a/gdb/source.c b/gdb/source.c
index 1f1a724564a4f13bcaee6b2598e345a67c81ff37..14051b71bae9dac7a92b217c11853ad55bf46f91 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1,6 +1,6 @@
 /* List lines of source files for GDB, the GNU debugger.
    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -91,6 +91,14 @@ static int current_source_line;
    things are wrapping, but that would be a fair amount of work.  */
 
 int lines_to_list = 10;
+static void
+show_lines_to_list (struct ui_file *file, int from_tty,
+                   struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("\
+Number of source lines gdb will list by default is %s.\n"),
+                   value);
+}
 
 /* Line number of last line printed.  Default for various commands.
    current_source_line is usually, but not always, the same as this.  */
@@ -134,7 +142,7 @@ get_lines_to_list (void)
 struct symtab_and_line
 get_current_source_symtab_and_line (void)
 {
-  struct symtab_and_line cursal;
+  struct symtab_and_line cursal = { };
 
   cursal.symtab = current_source_symtab;
   cursal.line = current_source_line;
@@ -173,7 +181,7 @@ set_default_source_symtab_and_line (void)
 struct symtab_and_line
 set_current_source_symtab_and_line (const struct symtab_and_line *sal)
 {
-  struct symtab_and_line cursal;
+  struct symtab_and_line cursal = { };
   
   cursal.symtab = current_source_symtab;
   cursal.line = current_source_line;
@@ -243,12 +251,10 @@ select_source_symtab (struct symtab *s)
     {
       for (s = ofp->symtabs; s; s = s->next)
        {
-         char *name = s->filename;
+         const char *name = s->filename;
          int len = strlen (name);
-         if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h"))))
-           {
-             current_source_symtab = s;
-           }
+         if (!(len > 2 && strcmp(&name[len - 2], ".h") == 0))
+           current_source_symtab = s;
        }
     }
   if (current_source_symtab)
@@ -260,12 +266,10 @@ select_source_symtab (struct symtab *s)
     {
       for (ps = ofp->psymtabs; ps != NULL; ps = ps->next)
        {
-         char *name = ps->filename;
+         const char *name = ps->filename;
          int len = strlen (name);
-         if (!(len > 2 && (DEPRECATED_STREQ (&name[len - 2], ".h"))))
-           {
-             cs_pst = ps;
-           }
+         if (!(len > 2 && strcmp (&name[len - 2], ".h") == 0))
+           cs_pst = ps;
        }
     }
   if (cs_pst)
@@ -479,10 +483,10 @@ add_path (char *dirname, char **which_path, int parse_separators)
        name = tilde_expand (name);
 #ifdef HAVE_DOS_BASED_FILE_SYSTEM
       else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */
-       name = concat (name, ".", NULL);
+       name = concat (name, ".", (char *)NULL);
 #endif
       else if (!IS_ABSOLUTE_PATH (name) && name[0] != '$')
-       name = concat (current_directory, SLASH_STRING, name, NULL);
+       name = concat (current_directory, SLASH_STRING, name, (char *)NULL);
       else
        name = savestring (name, p - name);
       make_cleanup (xfree, name);
@@ -555,15 +559,16 @@ add_path (char *dirname, char **which_path, int parse_separators)
 
                c = old[prefix];
                old[prefix] = '\0';
-               temp = concat (old, tinybuf, name, NULL);
+               temp = concat (old, tinybuf, name, (char *)NULL);
                old[prefix] = c;
-               *which_path = concat (temp, "", &old[prefix], NULL);
+               *which_path = concat (temp, "", &old[prefix], (char *)NULL);
                prefix = strlen (temp);
                xfree (temp);
              }
            else
              {
-               *which_path = concat (name, (old[0] ? tinybuf : old), old, NULL);
+               *which_path = concat (name, (old[0] ? tinybuf : old),
+                                     old, (char *)NULL);
                prefix = strlen (name);
              }
            xfree (old);
@@ -763,7 +768,7 @@ done:
          char *f = concat (current_directory,
                            IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])
                            ? "" : SLASH_STRING,
-                           filename, NULL);
+                           filename, (char *)NULL);
          *filename_opened = xfullpath (f);
          xfree (f);
        }
@@ -1633,10 +1638,10 @@ The matching line number is also stored as the value of \"$_\"."));
       add_com_alias ("?", "reverse-search", class_files, 0);
     }
 
-  deprecated_add_show_from_set
-    (add_set_cmd ("listsize", class_support, var_uinteger,
-                 (char *) &lines_to_list,
-                 "Set number of source lines gdb will list by default.",
-                 &setlist),
-     &showlist);
+  add_setshow_uinteger_cmd ("listsize", class_support, &lines_to_list, _("\
+Set number of source lines gdb will list by default."), _("\
+Show number of source lines gdb will list by default."), NULL,
+                           NULL,
+                           show_lines_to_list,
+                           &setlist, &showlist);
 }