ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/ealloc.c
(Generate patch)

Comparing ray/src/common/ealloc.c (file contents):
Revision 2.3 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.7 by schorsch, Mon Oct 27 10:19:31 2003 UTC

# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11   #include  <stdio.h>
12   #include  <stdlib.h>
13  
14 + #include "rterror.h"
15  
16 < char *
17 < emalloc(n)                      /* return pointer to n uninitialized bytes */
17 < unsigned int  n;
16 > extern char *   /* return pointer to n uninitialized bytes */
17 > emalloc(unsigned int  n)
18   {
19          register char  *cp;
20          
# Line 29 | Line 29 | unsigned int  n;
29   }
30  
31  
32 < char *
33 < ecalloc(ne, es)                 /* return pointer to initialized memory */
34 < register unsigned int  ne;
35 < unsigned int  es;
32 > extern char *                   /* return pointer to initialized memory */
33 > ecalloc(register unsigned int ne, unsigned int es)
34   {
35          register char  *cp;
36          
# Line 51 | Line 49 | unsigned int  es;
49   }
50  
51  
52 < char *
53 < erealloc(cp, n)                 /* reallocate cp to size n */
56 < register char  *cp;
57 < unsigned int  n;
52 > extern char *                   /* reallocate cp to size n */
53 > erealloc(register char  *cp, unsigned int  n)
54   {
55          if (n == 0) {
56                  if (cp != NULL)
57 <                        free(cp);
57 >                        free((void *)cp);
58                  return(NULL);
59          }
60  
# Line 75 | Line 71 | unsigned int  n;
71   }
72  
73  
74 < void
75 < efree(cp)                       /* free memory allocated by above */
80 < char  *cp;
74 > extern void                     /* free memory allocated by above */
75 > efree(char  *cp)
76   {
77 <        free((char *)cp);
77 >        free((void *)cp);
78   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines