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.9 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11   #include  <stdio.h>
12   #include  <stdlib.h>
13  
14 + #include "rterror.h"
15 + #include "rtmisc.h"
16  
17 < char *
18 < emalloc(n)                      /* return pointer to n uninitialized bytes */
17 < unsigned int  n;
17 > extern void *   /* return pointer to n uninitialized bytes */
18 > emalloc(size_t  n)
19   {
20 <        register char  *cp;
20 >        register void  *cp;
21          
22          if (n == 0)
23                  return(NULL);
24  
25 <        if ((cp = (char *)malloc(n)) != NULL)
25 >        if ((cp = malloc(n)) != NULL)
26                  return(cp);
27  
28          eputs("Out of memory in emalloc\n");
29          quit(1);
30 +        return NULL; /* pro forma return */
31   }
32  
33  
34 < char *
35 < ecalloc(ne, es)                 /* return pointer to initialized memory */
34 < register unsigned int  ne;
35 < unsigned int  es;
34 > extern void *                   /* return pointer to initialized memory */
35 > ecalloc(register size_t ne, size_t es)
36   {
37          register char  *cp;
38          
# Line 40 | Line 40 | unsigned int  es;
40          if (ne == 0)
41                  return(NULL);
42  
43 <        if ((cp = (char *)malloc(ne)) == NULL) {
43 >        if ((cp = malloc(ne)) == NULL) {
44                  eputs("Out of memory in ecalloc\n");
45                  quit(1);
46          }
# Line 51 | Line 51 | unsigned int  es;
51   }
52  
53  
54 < char *
55 < erealloc(cp, n)                 /* reallocate cp to size n */
56 < register char  *cp;
57 < unsigned int  n;
54 > extern void *                   /* reallocate cp to size n */
55 > erealloc(register void  *cp, size_t  n)
56   {
57          if (n == 0) {
58                  if (cp != NULL)
# Line 63 | Line 61 | unsigned int  n;
61          }
62  
63          if (cp == NULL)
64 <                cp = (char *)malloc(n);
64 >                cp = malloc(n);
65          else
66 <                cp = (char *)realloc((void *)cp, n);
66 >                cp = realloc(cp, n);
67  
68          if (cp != NULL)
69                  return(cp);
70  
71          eputs("Out of memory in erealloc\n");
72          quit(1);
73 +        return NULL; /* pro forma return */
74   }
75  
76  
77 < void
78 < efree(cp)                       /* free memory allocated by above */
80 < char  *cp;
77 > extern void                     /* free memory allocated by above */
78 > efree(void  *cp)
79   {
80 <        free((char *)cp);
80 >        free(cp);
81   }

Diff Legend

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