| 1 |
|
#ifndef lint |
| 2 |
< |
static const char RCSid[] = "$Id$"; |
| 2 |
> |
static const char RCSid[] = "$Id$"; |
| 3 |
|
#endif |
| 4 |
|
/* |
| 5 |
|
* Save unshared strings. |
| 7 |
|
* External symbols declared in standard.h |
| 8 |
|
*/ |
| 9 |
|
|
| 10 |
< |
/* ==================================================================== |
| 11 |
< |
* The Radiance Software License, Version 1.0 |
| 12 |
< |
* |
| 13 |
< |
* Copyright (c) 1990 - 2002 The Regents of the University of California, |
| 14 |
< |
* through Lawrence Berkeley National Laboratory. All rights reserved. |
| 15 |
< |
* |
| 16 |
< |
* Redistribution and use in source and binary forms, with or without |
| 17 |
< |
* modification, are permitted provided that the following conditions |
| 18 |
< |
* are met: |
| 19 |
< |
* |
| 20 |
< |
* 1. Redistributions of source code must retain the above copyright |
| 21 |
< |
* notice, this list of conditions and the following disclaimer. |
| 22 |
< |
* |
| 23 |
< |
* 2. Redistributions in binary form must reproduce the above copyright |
| 24 |
< |
* notice, this list of conditions and the following disclaimer in |
| 25 |
< |
* the documentation and/or other materials provided with the |
| 26 |
< |
* distribution. |
| 27 |
< |
* |
| 28 |
< |
* 3. The end-user documentation included with the redistribution, |
| 29 |
< |
* if any, must include the following acknowledgment: |
| 30 |
< |
* "This product includes Radiance software |
| 31 |
< |
* (http://radsite.lbl.gov/) |
| 32 |
< |
* developed by the Lawrence Berkeley National Laboratory |
| 33 |
< |
* (http://www.lbl.gov/)." |
| 34 |
< |
* Alternately, this acknowledgment may appear in the software itself, |
| 35 |
< |
* if and wherever such third-party acknowledgments normally appear. |
| 36 |
< |
* |
| 37 |
< |
* 4. The names "Radiance," "Lawrence Berkeley National Laboratory" |
| 38 |
< |
* and "The Regents of the University of California" must |
| 39 |
< |
* not be used to endorse or promote products derived from this |
| 40 |
< |
* software without prior written permission. For written |
| 41 |
< |
* permission, please contact [email protected]. |
| 42 |
< |
* |
| 43 |
< |
* 5. Products derived from this software may not be called "Radiance", |
| 44 |
< |
* nor may "Radiance" appear in their name, without prior written |
| 45 |
< |
* permission of Lawrence Berkeley National Laboratory. |
| 46 |
< |
* |
| 47 |
< |
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED |
| 48 |
< |
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 49 |
< |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 50 |
< |
* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR |
| 51 |
< |
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 52 |
< |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 53 |
< |
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
| 54 |
< |
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
| 55 |
< |
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
| 56 |
< |
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT |
| 57 |
< |
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 58 |
< |
* SUCH DAMAGE. |
| 59 |
< |
* ==================================================================== |
| 60 |
< |
* |
| 61 |
< |
* This software consists of voluntary contributions made by many |
| 62 |
< |
* individuals on behalf of Lawrence Berkeley National Laboratory. For more |
| 63 |
< |
* information on Lawrence Berkeley National Laboratory, please see |
| 64 |
< |
* <http://www.lbl.gov/>. |
| 65 |
< |
*/ |
| 10 |
> |
#include "copyright.h" |
| 11 |
|
|
| 12 |
|
#include <stdlib.h> |
| 13 |
|
|
| 14 |
< |
extern void eputs(); |
| 15 |
< |
extern void quit(); |
| 14 |
> |
#include "rtio.h" |
| 15 |
> |
#include "rterror.h" |
| 16 |
|
|
| 17 |
+ |
|
| 18 |
|
#if 1 |
| 19 |
|
|
| 20 |
|
char * |
| 21 |
< |
savqstr(s) /* save a private string */ |
| 76 |
< |
register char *s; |
| 21 |
> |
savqstr(const char *s) /* save a private string */ |
| 22 |
|
{ |
| 23 |
< |
register char *cp; |
| 23 |
> |
char *cp; |
| 24 |
|
char *newp; |
| 25 |
|
|
| 26 |
+ |
if (s == NULL) |
| 27 |
+ |
return(NULL); |
| 28 |
+ |
if (!*s) |
| 29 |
+ |
return(""); |
| 30 |
|
for (cp = s; *cp++; ) /* compute strlen()+1 */ |
| 31 |
|
; |
| 32 |
|
newp = (char *)malloc(cp-s); |
| 34 |
|
eputs("out of memory in savqstr"); |
| 35 |
|
quit(1); |
| 36 |
|
} |
| 37 |
< |
for (cp = newp; *cp++ = *s++; ) /* inline strcpy() */ |
| 37 |
> |
for (cp = newp; (*cp++ = *s++); ) /* inline strcpy() */ |
| 38 |
|
; |
| 39 |
|
return(newp); /* return new location */ |
| 40 |
|
} |
| 41 |
|
|
| 42 |
|
|
| 43 |
|
void |
| 44 |
< |
freeqstr(s) /* free a private string */ |
| 96 |
< |
char *s; |
| 44 |
> |
freeqstr(char *s) /* free a private string */ |
| 45 |
|
{ |
| 46 |
< |
free((void *)s); |
| 46 |
> |
if (s != NULL && *s) |
| 47 |
> |
free(s); |
| 48 |
|
} |
| 49 |
|
|
| 50 |
|
#else |
| 54 |
|
* large blocks to optimize paging in VM environments. |
| 55 |
|
*/ |
| 56 |
|
|
| 57 |
< |
#ifdef BIGMEM |
| 57 |
> |
#include "rtmisc.h" |
| 58 |
> |
|
| 59 |
> |
#ifdef SMLMEM |
| 60 |
|
#ifndef MINBLOCK |
| 61 |
< |
#define MINBLOCK (1<<12) /* minimum allocation block size */ |
| 61 |
> |
#define MINBLOCK (1<<10) /* minimum allocation block size */ |
| 62 |
|
#endif |
| 63 |
|
#ifndef MAXBLOCK |
| 64 |
< |
#define MAXBLOCK (1<<16) /* maximum allocation block size */ |
| 64 |
> |
#define MAXBLOCK (1<<14) /* maximum allocation block size */ |
| 65 |
|
#endif |
| 66 |
|
#else |
| 67 |
|
#ifndef MINBLOCK |
| 68 |
< |
#define MINBLOCK (1<<10) /* minimum allocation block size */ |
| 68 |
> |
#define MINBLOCK (1<<12) /* minimum allocation block size */ |
| 69 |
|
#endif |
| 70 |
|
#ifndef MAXBLOCK |
| 71 |
< |
#define MAXBLOCK (1<<14) /* maximum allocation block size */ |
| 71 |
> |
#define MAXBLOCK (1<<16) /* maximum allocation block size */ |
| 72 |
|
#endif |
| 73 |
|
#endif |
| 74 |
|
|
| 124 |
– |
extern char *bmalloc(); |
| 75 |
|
|
| 126 |
– |
|
| 76 |
|
char * |
| 77 |
< |
savqstr(s) /* save a private string */ |
| 129 |
< |
register char *s; |
| 77 |
> |
savqstr(const char *s) /* save a private string */ |
| 78 |
|
{ |
| 79 |
|
static char *curp = NULL; /* allocated memory pointer */ |
| 80 |
|
static unsigned nrem = 0; /* bytes remaining in block */ |
| 81 |
|
static unsigned nextalloc = MINBLOCK; /* next block size */ |
| 82 |
< |
register char *cp; |
| 83 |
< |
register unsigned n; |
| 82 |
> |
char *cp; |
| 83 |
> |
unsigned n; |
| 84 |
|
|
| 85 |
+ |
if (s == NULL) |
| 86 |
+ |
return(NULL); |
| 87 |
+ |
if (!*s) |
| 88 |
+ |
return(""); |
| 89 |
|
for (cp = s; *cp++; ) /* compute strlen()+1 */ |
| 90 |
|
; |
| 91 |
|
if ((n = cp-s) > nrem) { /* do we need more core? */ |
| 92 |
|
bfree(curp, nrem); /* free remnant */ |
| 93 |
|
while (n > nextalloc) |
| 94 |
|
nextalloc <<= 1; |
| 95 |
< |
if ((curp = bmalloc(nrem=nextalloc)) == NULL) { |
| 95 |
> |
if ((curp = (char *)bmalloc(nrem=nextalloc)) == NULL) { |
| 96 |
|
eputs("out of memory in savqstr"); |
| 97 |
|
quit(1); |
| 98 |
|
} |
| 109 |
|
|
| 110 |
|
|
| 111 |
|
void |
| 112 |
< |
freeqstr(s) /* free a private string (not recommended) */ |
| 161 |
< |
char *s; |
| 112 |
> |
freeqstr(char *s) /* free a private string (not recommended) */ |
| 113 |
|
{ |
| 114 |
< |
bfree(s, strlen(s)+1); |
| 114 |
> |
if (s != NULL && *s) |
| 115 |
> |
bfree(s, strlen(s)+1); |
| 116 |
|
} |
| 117 |
|
|
| 118 |
|
#endif |
