This is the mail archive of the
gdb-patches@sourceware.cygnus.com
mailing list for the GDB project.
Re: Heads up - Alpha ISO-C fixes
- To: GDB Patches <gdb-patches at sourceware dot cygnus dot com>
- Subject: Re: Heads up - Alpha ISO-C fixes
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Sat, 04 Mar 2000 13:20:28 +1100
- Organization: Cygnus Solutions
- References: <38BF7D8C.BE18FAAF@cygnus.com>
This one hurts. Things to do post 5.0 is think about ISO-C-fying
mmalloc :-)
Andrew
Sat Mar 4 13:02:09 2000 Andrew Cagney <cagney@b1.cygnus.com>
* utils.c (mcalloc), defs.h (mcalloc): Keep consistent with
"mmalloc.h" which means using PTRs.
(init_malloc, msavestring, mstrsave): Convert to PTR free ISO-C.
Index: gdb/defs.h
===================================================================
RCS file: /cvs/src/src/gdb/defs.h,v
retrieving revision 1.8
diff -p -r1.8 defs.h
*** defs.h 2000/03/04 01:15:32 1.8
--- defs.h 2000/03/04 02:18:00
*************** extern int myread (int, char *, int);
*** 341,347 ****
extern int query (char *, ...) ATTR_FORMAT (printf, 1, 2);
#if !defined (USE_MMALLOC)
! extern PTR mcalloc (void *, size_t, size_t);
extern PTR mmalloc (PTR, size_t);
extern PTR mrealloc (PTR, PTR, size_t);
extern void mfree (PTR, PTR);
--- 341,350 ----
extern int query (char *, ...) ATTR_FORMAT (printf, 1, 2);
#if !defined (USE_MMALLOC)
! /* NOTE: cagney/2000-03-04: The mmalloc functions need to use PTR
! rather than void* so that they are consistent with
! ../mmalloc/mmalloc.h. */
! extern PTR mcalloc (PTR, size_t, size_t);
extern PTR mmalloc (PTR, size_t);
extern PTR mrealloc (PTR, PTR, size_t);
extern void mfree (PTR, PTR);
Index: gdb/utils.c
===================================================================
RCS file: /cvs/src/src/gdb/utils.c,v
retrieving revision 1.3
diff -p -r1.3 utils.c
*** utils.c 2000/03/04 00:40:40 1.3
--- utils.c 2000/03/04 02:18:07
*************** request_quit (signo)
*** 919,926 ****
#if !defined (USE_MMALLOC)
! void *
! mcalloc (void *md, size_t number, size_t size)
{
return calloc (number, size);
}
--- 919,926 ----
#if !defined (USE_MMALLOC)
! PTR
! mcalloc (PTR md, size_t number, size_t size)
{
return calloc (number, size);
}
*************** mfree (md, ptr)
*** 958,965 ****
#if !defined (USE_MMALLOC) || defined (NO_MMCHECK)
void
! init_malloc (md)
! PTR md;
{
}
--- 958,964 ----
#if !defined (USE_MMALLOC) || defined (NO_MMCHECK)
void
! init_malloc (void *md)
{
}
*************** malloc_botch ()
*** 991,998 ****
#endif
void
! init_malloc (md)
! PTR md;
{
if (!mmcheckf (md, malloc_botch, MMCHECK_FORCE))
{
--- 990,996 ----
#endif
void
! init_malloc (void *md)
{
if (!mmcheckf (md, malloc_botch, MMCHECK_FORCE))
{
*************** savestring (ptr, size)
*** 1149,1158 ****
}
char *
! msavestring (md, ptr, size)
! PTR md;
! const char *ptr;
! int size;
{
register char *p = (char *) xmmalloc (md, size + 1);
memcpy (p, ptr, size);
--- 1147,1153 ----
}
char *
! msavestring (void *md, const char *ptr, int size)
{
register char *p = (char *) xmmalloc (md, size + 1);
memcpy (p, ptr, size);
*************** strsave (ptr)
*** 1171,1179 ****
}
char *
! mstrsave (md, ptr)
! PTR md;
! const char *ptr;
{
return (msavestring (md, ptr, strlen (ptr)));
}
--- 1166,1172 ----
}
char *
! mstrsave (void *md, const char *ptr)
{
return (msavestring (md, ptr, strlen (ptr)));
}