5 |
|
* ealloc.c - memory routines which call quit on error. |
6 |
|
*/ |
7 |
|
|
8 |
< |
/* ==================================================================== |
9 |
< |
* The Radiance Software License, Version 1.0 |
10 |
< |
* |
11 |
< |
* Copyright (c) 1990 - 2002 The Regents of the University of California, |
12 |
< |
* through Lawrence Berkeley National Laboratory. All rights reserved. |
13 |
< |
* |
14 |
< |
* Redistribution and use in source and binary forms, with or without |
15 |
< |
* modification, are permitted provided that the following conditions |
16 |
< |
* are met: |
17 |
< |
* |
18 |
< |
* 1. Redistributions of source code must retain the above copyright |
19 |
< |
* notice, this list of conditions and the following disclaimer. |
20 |
< |
* |
21 |
< |
* 2. Redistributions in binary form must reproduce the above copyright |
22 |
< |
* notice, this list of conditions and the following disclaimer in |
23 |
< |
* the documentation and/or other materials provided with the |
24 |
< |
* distribution. |
25 |
< |
* |
26 |
< |
* 3. The end-user documentation included with the redistribution, |
27 |
< |
* if any, must include the following acknowledgment: |
28 |
< |
* "This product includes Radiance software |
29 |
< |
* (http://radsite.lbl.gov/) |
30 |
< |
* developed by the Lawrence Berkeley National Laboratory |
31 |
< |
* (http://www.lbl.gov/)." |
32 |
< |
* Alternately, this acknowledgment may appear in the software itself, |
33 |
< |
* if and wherever such third-party acknowledgments normally appear. |
34 |
< |
* |
35 |
< |
* 4. The names "Radiance," "Lawrence Berkeley National Laboratory" |
36 |
< |
* and "The Regents of the University of California" must |
37 |
< |
* not be used to endorse or promote products derived from this |
38 |
< |
* software without prior written permission. For written |
39 |
< |
* permission, please contact [email protected]. |
40 |
< |
* |
41 |
< |
* 5. Products derived from this software may not be called "Radiance", |
42 |
< |
* nor may "Radiance" appear in their name, without prior written |
43 |
< |
* permission of Lawrence Berkeley National Laboratory. |
44 |
< |
* |
45 |
< |
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED |
46 |
< |
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
47 |
< |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
48 |
< |
* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR |
49 |
< |
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
50 |
< |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
51 |
< |
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
52 |
< |
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
53 |
< |
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
54 |
< |
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT |
55 |
< |
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
56 |
< |
* SUCH DAMAGE. |
57 |
< |
* ==================================================================== |
58 |
< |
* |
59 |
< |
* This software consists of voluntary contributions made by many |
60 |
< |
* individuals on behalf of Lawrence Berkeley National Laboratory. For more |
61 |
< |
* information on Lawrence Berkeley National Laboratory, please see |
62 |
< |
* <http://www.lbl.gov/>. |
63 |
< |
*/ |
8 |
> |
#include "copyright.h" |
9 |
|
|
10 |
|
|
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 */ |
72 |
< |
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 */ |
89 |
< |
register unsigned int ne; |
90 |
< |
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 |
|
|
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 |
|
} |
51 |
|
} |
52 |
|
|
53 |
|
|
54 |
< |
char * |
55 |
< |
erealloc(cp, n) /* reallocate cp to size n */ |
111 |
< |
register char *cp; |
112 |
< |
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) |
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 */ |
135 |
< |
char *cp; |
77 |
> |
extern void /* free memory allocated by above */ |
78 |
> |
efree(void *cp) |
79 |
|
{ |
80 |
< |
free((char *)cp); |
80 |
> |
free(cp); |
81 |
|
} |