2003-01-12 David Carlton <carlton@bactrian.org>

	* linespec.c (symtab_from_filename): Rename variable 's' to
	'file_symtab'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1527413df3c77f2d9de7d712ede2f9a9e1bccfbe..4c2c4b6b2e2b1ee281448a0d0b7fb6382b6db9a3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-12  David Carlton  <carlton@bactrian.org>
+
+       * linespec.c (symtab_from_filename): Rename variable 's' to
+       'file_symtab'.
+
 2003-01-12  Andrew Cagney  <ac131313@redhat.com>
 
        * d10v-tdep.c (d10v_init_extra_frame_info): Remove checks for a

diff --git a/gdb/linespec.c b/gdb/linespec.c
index fc64ebe0f715a07ada7dc5652741c17b656e1174..e4dd2b110764e58e224b8eedff589a165b35aae6 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1177,7 +1177,7 @@ symtab_from_filename (char **argptr, char *p, int is_quote_enclosed)
 {
   char *p1;
   char *copy;
-  struct symtab *s;
+  struct symtab *file_symtab;
   
   p1 = p;
   while (p != *argptr && p[-1] == ' ')
@@ -1193,8 +1193,8 @@ symtab_from_filename (char **argptr, char *p, int is_quote_enclosed)
     copy[p - *argptr] = 0;
 
   /* Find that file's data.  */
-  s = lookup_symtab (copy);
-  if (s == 0)
+  file_symtab = lookup_symtab (copy);
+  if (file_symtab == 0)
     {
       if (!have_full_symbols () && !have_partial_symbols ())
        error ("No symbol table is loaded.  Use the \"file\" command.");
@@ -1207,7 +1207,7 @@ symtab_from_filename (char **argptr, char *p, int is_quote_enclosed)
     p++;
   *argptr = p;
 
-  return s;
+  return file_symtab;
 }
 
 \f