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

* ada-lang.c (grow_vect): Return the new array instead of

Browse source 
expecting pointer to pointer to avoid violation of aliasing rules.
	* ada-lang.h (GROW_VECT): Adapt call to grow_vect.
This commit is contained in:
Andreas Schwab 2004-10-23 19:13:26 +00:00
parent 0fd555c412
commit f27cf670a8
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2004-10-23 Andreas Schwab <schwab@suse.de>
* ada-lang.c (grow_vect): Return the new array instead of
expecting pointer to pointer to avoid violation of aliasing rules.
* ada-lang.h (GROW_VECT): Adapt call to grow_vect.
2004-10-23 Ulrich Weigand <uweigand@de.ibm.com> 2004-10-23 Ulrich Weigand <uweigand@de.ibm.com>
* s390-tdep.c (enum pv_boolean): Remove. * s390-tdep.c (enum pv_boolean): Remove.

11
gdb/ada-lang.c
View file

@ -319,20 +319,21 @@ extract_string (CORE_ADDR addr, char *buf)
while (buf[char_index - 1] != '\000'); while (buf[char_index - 1] != '\000');
} }
/* Assuming *OLD_VECT points to an array of *SIZE objects of size /* Assuming VECT points to an array of *SIZE objects of size
ELEMENT_SIZE, grow it to contain at least MIN_SIZE objects, ELEMENT_SIZE, grow it to contain at least MIN_SIZE objects,
updating *OLD_VECT and *SIZE as necessary. */ updating *SIZE as necessary and returning the (new) array. */
void void *
grow_vect (void **old_vect, size_t * size, size_t min_size, int element_size) grow_vect (void *vect, size_t *size, size_t min_size, int element_size)
{ {
if (*size < min_size) if (*size < min_size)
{ {
*size *= 2; *size *= 2;
if (*size < min_size) if (*size < min_size)
*size = min_size; *size = min_size;
*old_vect = xrealloc (*old_vect, *size * element_size); vect = xrealloc (vect, *size * element_size);
} }
return vect;
} }
/* True (non-zero) iff TARGET matches FIELD_NAME up to any trailing /* True (non-zero) iff TARGET matches FIELD_NAME up to any trailing

4
gdb/ada-lang.h
View file

@ -171,9 +171,9 @@ extern struct task_entry *task_list;
least M objects, updating V and S as necessary. */ least M objects, updating V and S as necessary. */
#define GROW_VECT(v, s, m) \ #define GROW_VECT(v, s, m) \
if ((s) < (m)) grow_vect ((void**) &(v), &(s), (m), sizeof(*(v))); if ((s) < (m)) (v) = grow_vect (v, &(s), m, sizeof *(v));
extern void grow_vect (void **, size_t *, size_t, int); extern void *grow_vect (void *, size_t *, size_t, int);
extern int ada_get_field_index (const struct type *type, extern int ada_get_field_index (const struct type *type,
const char *field_name, const char *field_name,