FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify REGISTRY cleanup usages

Browse source 
In registry.c:registry_clear_data, the registered data is iterated and
invoke each 'free' function with the data passed:

  for (registration = data_registry->registrations, i = 0;
       i < fields->num_data;
       registration = registration->next, i++)
    if (fields->data[i] != NULL && registration->data->free != NULL)
      adaptor (registration->data->free, container, fields->data[i]);

we can see that data is passed to function 'free' and data is not NULL.
In each usage, we don't have to get the data again through key and
do NULL pointer checking.  This patch is to simplify them.

gdb:

2013-10-29  Yao Qi  <yao@codesourcery.com>

	* auto-load.c (auto_load_pspace_data_cleanup): Get data from
	parameter 'arg' instead of from program_space_data.
	* objfiles.c (objfiles_pspace_data_cleanup): Likewise.
	* solib-darwin.c (darwin_pspace_data_cleanup): Likewise.
	* solib-dsbt.c (dsbt_pspace_data_cleanup): Likewise.
	* solib-svr4.c (svr4_pspace_data_cleanup): Likewise.
	* inflow.c (inflow_inferior_data_cleanup): Get data from
	parameter 'arg' instead of inferior_data.
	* registry.h: Add comments.
This commit is contained in:
Yao Qi 2013-10-24 20:42:02 +08:00
parent 3c4797ba74
commit 487ad57ccf
8 changed files with 30 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gdb/ChangeLog
View file

@ -1,3 +1,15 @@
2013-10-29 Yao Qi <yao@codesourcery.com>
* auto-load.c (auto_load_pspace_data_cleanup): Get data from
parameter 'arg' instead of from program_space_data.
* objfiles.c (objfiles_pspace_data_cleanup): Likewise.
* solib-darwin.c (darwin_pspace_data_cleanup): Likewise.
* solib-dsbt.c (dsbt_pspace_data_cleanup): Likewise.
* solib-svr4.c (svr4_pspace_data_cleanup): Likewise.
* inflow.c (inflow_inferior_data_cleanup): Get data from
parameter 'arg' instead of inferior_data.
* registry.h: Add comments.
2013-10-28 Pedro Alves <palves@redhat.com>
* breakpoint.c (watchpoints_triggered)

6
gdb/auto-load.c
View file

@ -572,15 +572,11 @@ static const struct program_space_data *auto_load_pspace_data;
static void
auto_load_pspace_data_cleanup (struct program_space *pspace, void *arg)
{
struct auto_load_pspace_info *info;
struct auto_load_pspace_info *info = arg;
info = program_space_data (pspace, auto_load_pspace_data);
if (info != NULL)
{
if (info->loaded_scripts)
htab_delete (info->loaded_scripts);
xfree (info);
}
}
/* Get the current autoload data. If none is found yet, add it now. This

6
gdb/inflow.c
View file

@ -487,15 +487,11 @@ static const struct inferior_data *inflow_inferior_data;
static void
inflow_inferior_data_cleanup (struct inferior *inf, void *arg)
{
struct terminal_info *info;
struct terminal_info *info = arg;
info = inferior_data (inf, inflow_inferior_data);
if (info != NULL)
{
xfree (info->run_terminal);
xfree (info->ttystate);
xfree (info);
}
}
/* Get the current svr4 data. If none is found yet, add it now. This

6
gdb/objfiles.c
View file

@ -85,14 +85,10 @@ static const struct program_space_data *objfiles_pspace_data;
static void
objfiles_pspace_data_cleanup (struct program_space *pspace, void *arg)
{
struct objfile_pspace_info *info;
struct objfile_pspace_info *info = arg;
info = program_space_data (pspace, objfiles_pspace_data);
if (info != NULL)
{
xfree (info->sections);
xfree (info);
}
}
/* Get the current svr4 data. If none is found yet, add it now. This

7
gdb/registry.h
View file

@ -45,11 +45,12 @@
- register_TAG_data_with_cleanup(TAG, SAVE, FREE)
Get a new key for the container type TAG.
SAVE and FREE are defined as void (*) (struct TAG *, void *)
When the container is destroyed, first all registered SAVE
SAVE and FREE are defined as void (*) (struct TAG *object, void *data)
When the container object OBJECT is destroyed, first all registered SAVE
functions are called.
Then all FREE functions are called.
Either or both may be NULL.
Either or both may be NULL. DATA is the data associated with the
container object OBJECT.
- clear_TAG_data(TAG, OBJECT)
Clear all the data associated with OBJECT. Should be called by the

5
gdb/solib-darwin.c
View file

@ -88,10 +88,7 @@ static const struct program_space_data *solib_darwin_pspace_data;
static void
darwin_pspace_data_cleanup (struct program_space *pspace, void *arg)
{
struct darwin_info *info;
info = program_space_data (pspace, solib_darwin_pspace_data);
xfree (info);
xfree (arg);
}
/* Get the current darwin data. If none is found yet, add it now. This

5
gdb/solib-dsbt.c
View file

@ -166,10 +166,7 @@ static const struct program_space_data *solib_dsbt_pspace_data;
static void
dsbt_pspace_data_cleanup (struct program_space *pspace, void *arg)
{
struct dsbt_info *info;
info = program_space_data (pspace, solib_dsbt_pspace_data);
xfree (info);
xfree (arg);
}
/* Get the current dsbt data. If none is found yet, add it now. This

6
gdb/solib-svr4.c
View file

@ -407,11 +407,7 @@ free_solib_list (struct svr4_info *info)
static void
svr4_pspace_data_cleanup (struct program_space *pspace, void *arg)
{
struct svr4_info *info;
info = program_space_data (pspace, solib_svr4_pspace_data);
if (info == NULL)
return;
struct svr4_info *info = arg;
free_probes_table (info);
free_solib_list (info);