Avoids false positives with -Wcast-qual:

* obstack.h (obstack_grow, obstack_grow0): Move (char*) casts
	in calls to `_obstack_memcpy' from here ...

	(_obstack_memcpy): ... to here, except in the __STDC__ case which
	doesn't need it.

From-SVN: r29028
This commit is contained in:
Kaveh R. Ghazi 1999-09-01 14:44:56 +00:00 committed by Kaveh Ghazi
parent 05d106753d
commit 98c3e05ded
2 changed files with 20 additions and 8 deletions

View File

@ -1,3 +1,11 @@
1999-09-01 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* obstack.h (obstack_grow, obstack_grow0): Move (char*) casts
in calls to `_obstack_memcpy' from here ...
(_obstack_memcpy): ... to here, except in the __STDC__ case which
doesn't need it.
1999-08-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 1999-08-30 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libiberty.h (getpwd): Prototype. * libiberty.h (getpwd): Prototype.

View File

@ -143,12 +143,16 @@ extern "C" {
#if defined _LIBC || defined HAVE_STRING_H #if defined _LIBC || defined HAVE_STRING_H
# include <string.h> # include <string.h>
# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) # if defined __STDC__ && __STDC__
#else
# ifdef memcpy
# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) # define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
# else # else
# define _obstack_memcpy(To, From, N) bcopy ((From), (To), (N)) # define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N))
# endif
#else
# ifdef memcpy
# define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N))
# else
# define _obstack_memcpy(To, From, N) bcopy ((char *)(From), (To), (N))
# endif # endif
#endif #endif
@ -385,7 +389,7 @@ __extension__ \
int __len = (length); \ int __len = (length); \
if (__o->next_free + __len > __o->chunk_limit) \ if (__o->next_free + __len > __o->chunk_limit) \
_obstack_newchunk (__o, __len); \ _obstack_newchunk (__o, __len); \
_obstack_memcpy (__o->next_free, (char *) (where), __len); \ _obstack_memcpy (__o->next_free, (where), __len); \
__o->next_free += __len; \ __o->next_free += __len; \
(void) 0; }) (void) 0; })
@ -395,7 +399,7 @@ __extension__ \
int __len = (length); \ int __len = (length); \
if (__o->next_free + __len + 1 > __o->chunk_limit) \ if (__o->next_free + __len + 1 > __o->chunk_limit) \
_obstack_newchunk (__o, __len + 1); \ _obstack_newchunk (__o, __len + 1); \
_obstack_memcpy (__o->next_free, (char *) (where), __len); \ _obstack_memcpy (__o->next_free, (where), __len); \
__o->next_free += __len; \ __o->next_free += __len; \
*(__o->next_free)++ = 0; \ *(__o->next_free)++ = 0; \
(void) 0; }) (void) 0; })
@ -510,14 +514,14 @@ __extension__ \
( (h)->temp = (length), \ ( (h)->temp = (length), \
(((h)->next_free + (h)->temp > (h)->chunk_limit) \ (((h)->next_free + (h)->temp > (h)->chunk_limit) \
? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \
_obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp), \ _obstack_memcpy ((h)->next_free, (where), (h)->temp), \
(h)->next_free += (h)->temp) (h)->next_free += (h)->temp)
# define obstack_grow0(h,where,length) \ # define obstack_grow0(h,where,length) \
( (h)->temp = (length), \ ( (h)->temp = (length), \
(((h)->next_free + (h)->temp + 1 > (h)->chunk_limit) \ (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit) \
? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0), \ ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0), \
_obstack_memcpy ((h)->next_free, (char *) (where), (h)->temp), \ _obstack_memcpy ((h)->next_free, (where), (h)->temp), \
(h)->next_free += (h)->temp, \ (h)->next_free += (h)->temp, \
*((h)->next_free)++ = 0) *((h)->next_free)++ = 0)