* python/py-auto-load.c (info_auto_load_scripts): Pass address of
scripts vector to collect_matching_scripts. (collect_matching_scripts): Update.
This commit is contained in:
parent
9542d6ad01
commit
87c31f0622
|
@ -1,3 +1,9 @@
|
||||||
|
2011-12-19 Doug Evans <dje@google.com>
|
||||||
|
|
||||||
|
* python/py-auto-load.c (info_auto_load_scripts): Pass address of
|
||||||
|
scripts vector to collect_matching_scripts.
|
||||||
|
(collect_matching_scripts): Update.
|
||||||
|
|
||||||
2011-12-19 Jan Kratochvil <jan.kratochvil@redhat.com>
|
2011-12-19 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||||
|
|
||||||
* symfile.c (reread_symbols): Move free_objfile_separate_debug,
|
* symfile.c (reread_symbols): Move free_objfile_separate_debug,
|
||||||
|
|
|
@ -481,10 +481,10 @@ static int
|
||||||
collect_matching_scripts (void **slot, void *info)
|
collect_matching_scripts (void **slot, void *info)
|
||||||
{
|
{
|
||||||
struct loaded_script *script = *slot;
|
struct loaded_script *script = *slot;
|
||||||
VEC (loaded_script_ptr) *scripts = info;
|
VEC (loaded_script_ptr) **scripts_ptr = info;
|
||||||
|
|
||||||
if (re_exec (script->name))
|
if (re_exec (script->name))
|
||||||
VEC_safe_push (loaded_script_ptr, scripts, script);
|
VEC_safe_push (loaded_script_ptr, *scripts_ptr, script);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -563,8 +563,9 @@ info_auto_load_scripts (char *pattern, int from_tty)
|
||||||
if (pspace_info != NULL && pspace_info->loaded_scripts != NULL)
|
if (pspace_info != NULL && pspace_info->loaded_scripts != NULL)
|
||||||
{
|
{
|
||||||
immediate_quit++;
|
immediate_quit++;
|
||||||
|
/* Pass a pointer to scripts as VEC_safe_push can realloc space. */
|
||||||
htab_traverse_noresize (pspace_info->loaded_scripts,
|
htab_traverse_noresize (pspace_info->loaded_scripts,
|
||||||
collect_matching_scripts, scripts);
|
collect_matching_scripts, &scripts);
|
||||||
immediate_quit--;
|
immediate_quit--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue