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

Comparing ray/src/common/savqstr.c (file contents):
Revision 2.3 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.10 by greg, Fri Jun 1 19:17:17 2012 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  Save unshared strings.
# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
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(char *s)                        /* save a private string */
22   {
23 <        register char  *cp;
23 >        char  *cp;
24          char  *newp;
25  
26          for (cp = s; *cp++; )                   /* compute strlen()+1 */
# Line 85 | Line 30 | register char  *s;
30                  eputs("out of memory in savqstr");
31                  quit(1);
32          }
33 <        for (cp = newp; *cp++ = *s++; )         /* inline strcpy() */
33 >        for (cp = newp; (*cp++ = *s++); )               /* inline strcpy() */
34                  ;
35          return(newp);                           /* return new location */
36   }
37  
38  
39   void
40 < freeqstr(s)                     /* free a private string */
96 < char  *s;
40 > freeqstr(char *s)                       /* free a private string */
41   {
42 <        free((void *)s);
42 >        if (s != NULL)
43 >                free((void *)s);
44   }
45  
46   #else
# Line 105 | Line 50 | char  *s;
50   *  large blocks to optimize paging in VM environments.
51   */
52  
53 < #ifdef  BIGMEM
53 > #include "rtmisc.h"
54 >
55 > #ifdef  SMLMEM
56   #ifndef  MINBLOCK
57 < #define  MINBLOCK       (1<<12)         /* minimum allocation block size */
57 > #define  MINBLOCK       (1<<10)         /* minimum allocation block size */
58   #endif
59   #ifndef  MAXBLOCK
60 < #define  MAXBLOCK       (1<<16)         /* maximum allocation block size */
60 > #define  MAXBLOCK       (1<<14)         /* maximum allocation block size */
61   #endif
62   #else
63   #ifndef  MINBLOCK
64 < #define  MINBLOCK       (1<<10)         /* minimum allocation block size */
64 > #define  MINBLOCK       (1<<12)         /* minimum allocation block size */
65   #endif
66   #ifndef  MAXBLOCK
67 < #define  MAXBLOCK       (1<<14)         /* maximum allocation block size */
67 > #define  MAXBLOCK       (1<<16)         /* maximum allocation block size */
68   #endif
69   #endif
70  
124 extern char  *bmalloc();
71  
126
72   char *
73 < savqstr(s)                      /* save a private string */
129 < register char  *s;
73 > savqstr(char *s)                        /* save a private string */
74   {
75          static char  *curp = NULL;              /* allocated memory pointer */
76          static unsigned  nrem = 0;              /* bytes remaining in block */
77          static unsigned  nextalloc = MINBLOCK;  /* next block size */
78 <        register char  *cp;
79 <        register unsigned  n;
78 >        char  *cp;
79 >        unsigned  n;
80  
81          for (cp = s; *cp++; )                   /* compute strlen()+1 */
82                  ;
# Line 157 | Line 101 | register char  *s;
101  
102  
103   void
104 < freeqstr(s)                     /* free a private string (not recommended) */
161 < char  *s;
104 > freeqstr(char *s)               /* free a private string (not recommended) */
105   {
106          bfree(s, strlen(s)+1);
107   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines