[PATCH] source.c, find_source_lines

[PATCH] source.c, find_source_lines

[msnyder]

[-- Attachment #1: Type: text/plain, Size: 103 bytes --]

Since 's' is repeatedly assumed, let's assert it rather than
sometimes checking it and sometimes not.


[-- Attachment #2: 57.txt --]
[-- Type: text/plain, Size: 1145 bytes --]

2007-08-11  Michael Snyder  <msnyder@access-company.com>

	* source.c (find_source_lines): Require symtab 's'.

Index: source.c
===================================================================
RCS file: /cvs/src/src/gdb/source.c,v
retrieving revision 1.80
diff -p -r1.80 source.c
*** source.c	28 Jun 2007 22:14:06 -0000	1.80
--- source.c	11 Aug 2007 20:46:35 -0000
*************** find_source_lines (struct symtab *s, int
*** 1122,1132 ****
    long mtime = 0;
    int size;
  
    line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
    if (fstat (desc, &st) < 0)
      perror_with_name (s->filename);
  
!   if (s && s->objfile && s->objfile->obfd)
      mtime = bfd_get_mtime (s->objfile->obfd);
    else if (exec_bfd)
      mtime = bfd_get_mtime (exec_bfd);
--- 1122,1133 ----
    long mtime = 0;
    int size;
  
+   gdb_assert (s);
    line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
    if (fstat (desc, &st) < 0)
      perror_with_name (s->filename);
  
!   if (s->objfile && s->objfile->obfd)
      mtime = bfd_get_mtime (s->objfile->obfd);
    else if (exec_bfd)
      mtime = bfd_get_mtime (exec_bfd);

Re: [PATCH] source.c, find_source_lines

[Jim Blandy]

msnyder@sonic.net writes:
> Since 's' is repeatedly assumed, let's assert it rather than
> sometimes checking it and sometimes not.

Yeah... I don't see what this function would even be intended to do
when passed NULL.

Re: [PATCH] source.c, find_source_lines

[msnyder]

>
> msnyder@sonic.net writes:
>> Since 's' is repeatedly assumed, let's assert it rather than
>> sometimes checking it and sometimes not.
>
> Yeah... I don't see what this function would even be intended to do
> when passed NULL.

Thanks, committed.