MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make unlink_objfile and put_objfile_before static

Browse Source 
I noticed an obsolete comment just before unlink_objfile, and then I
noticed that both unlink_objfile and put_objfile_before could be
static.  This patch makes these changes, and also moves unlink_objfile
earlier, so that a forward declaration is not needed.

Tested by rebuilding.

gdb/ChangeLog
2019-10-20  Tom Tromey  <tom@tromey.com>

	* objfiles.h (unlink_objfile, put_objfile_before): Don't declare.
	* objfiles.c (unlink_objfile): Move earlier.  Now static.  Remove
	obsolete comment.
	(put_objfile_before): Now static.

Change-Id: I1b5927a60fd1cc59bfc9c6761f61652a01ef13e0
This commit is contained in:
Tom Tromey 2019-10-20 20:41:20 -06:00
parent fd65fe1a18
commit 54d83b8d39
3 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2019-10-20 Tom Tromey <tom@tromey.com>
* objfiles.h (unlink_objfile, put_objfile_before): Don't declare.
* objfiles.c (unlink_objfile): Move earlier. Now static. Remove
obsolete comment.
(put_objfile_before): Now static.
2019-10-19 Simon Marchi <simon.marchi@polymtl.ca> 2019-10-19 Simon Marchi <simon.marchi@polymtl.ca>
* gdbsupport/common-utils.h (startswith): Change return type to * gdbsupport/common-utils.h (startswith): Change return type to

55
gdb/objfiles.c
View File

@ -473,10 +473,31 @@ separate_debug_iterator::operator++ ()
return *this; return *this;
} }
/* Unlink OBJFILE from the list of known objfiles. */
static void
unlink_objfile (struct objfile *objfile)
{
struct objfile **objpp;
for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp)->next))
{
if (*objpp == objfile)
{
*objpp = (*objpp)->next;
objfile->next = NULL;
return;
}
}
internal_error (__FILE__, __LINE__,
_("unlink_objfile: objfile already unlinked"));
}
/* Put one object file before a specified on in the global list. /* Put one object file before a specified on in the global list.
This can be used to make sure an object file is destroyed before This can be used to make sure an object file is destroyed before
another when using objfiles_safe to free all objfiles. */ another when using objfiles_safe to free all objfiles. */
void static void
put_objfile_before (struct objfile *objfile, struct objfile *before_this) put_objfile_before (struct objfile *objfile, struct objfile *before_this)
{ {
struct objfile **objp; struct objfile **objp;
@ -497,38 +518,6 @@ put_objfile_before (struct objfile *objfile, struct objfile *before_this)
_("put_objfile_before: before objfile not in list")); _("put_objfile_before: before objfile not in list"));
} }
/* Unlink OBJFILE from the list of known objfiles, if it is found in the
list.
It is not a bug, or error, to call this function if OBJFILE is not known
to be in the current list. This is done in the case of mapped objfiles,
for example, just to ensure that the mapped objfile doesn't appear twice
in the list. Since the list is threaded, linking in a mapped objfile
twice would create a circular list.
If OBJFILE turns out to be in the list, we zap it's NEXT pointer after
unlinking it, just to ensure that we have completely severed any linkages
between the OBJFILE and the list. */
void
unlink_objfile (struct objfile *objfile)
{
struct objfile **objpp;
for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp)->next))
{
if (*objpp == objfile)
{
*objpp = (*objpp)->next;
objfile->next = NULL;
return;
}
}
internal_error (__FILE__, __LINE__,
_("unlink_objfile: objfile already unlinked"));
}
/* Add OBJFILE as a separate debug objfile of PARENT. */ /* Add OBJFILE as a separate debug objfile of PARENT. */
void void

4
gdb/objfiles.h
View File

@ -637,12 +637,8 @@ extern CORE_ADDR entry_point_address (void);
extern void build_objfile_section_table (struct objfile *); extern void build_objfile_section_table (struct objfile *);
extern void put_objfile_before (struct objfile *, struct objfile *);
extern void add_separate_debug_objfile (struct objfile *, struct objfile *); extern void add_separate_debug_objfile (struct objfile *, struct objfile *);
extern void unlink_objfile (struct objfile *);
extern void free_objfile_separate_debug (struct objfile *); extern void free_objfile_separate_debug (struct objfile *);
extern void free_all_objfiles (void); extern void free_all_objfiles (void);