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

Comparing ray/src/common/lamps.c (file contents):
Revision 2.4 by greg, Wed Mar 1 10:40:18 1995 UTC vs.
Revision 2.9 by schorsch, Sun Jun 8 12:03:09 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1990 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Load lamp data.
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  <stdio.h>
11 + #include  <stdlib.h>
12   #include  <ctype.h>
13  
14 < extern char     *eindex(), *expsave(), *malloc();
14 > #include  "standard.h"
15 > #include  "color.h"
16 >
17 > extern char     *eindex(), *expsave();
18   extern FILE     *frlibopen();
19  
20   typedef struct lamp {
# Line 24 | Line 27 | static LAMP    *lamps = NULL;          /* lamp list */
27  
28  
29   float *
30 < matchlamp(s)                            /* see if string matches any lamp */
31 < char    *s;
30 > matchlamp(                              /* see if string matches any lamp */
31 > char    *s
32 > )
33   {
34          register LAMP   *lp;
35  
# Line 38 | Line 42 | char   *s;
42   }
43  
44  
45 < loadlamps(file)                                 /* load lamp type file */
46 < char    *file;
45 > int
46 > loadlamps(                                      /* load lamp type file */
47 > char    *file
48 > )
49   {
50          LAMP    *lastp;
51          register LAMP   *lp;
# Line 125 | Line 131 | fmterr:
131   }
132  
133  
134 < freelamps()                     /* free our lamps list */
134 > void
135 > freelamps(void)                 /* free our lamps list */
136   {
137          register LAMP   *lp1, *lp2;
138          
# Line 135 | Line 142 | freelamps()                    /* free our lamps list */
142                          for (lp2 = lp1->next; lp2 != NULL; lp2 = lp2->next)
143                                  if (lp2->color == lp1->color)
144                                          lp2->color = NULL;
145 <                        free((char *)lp1->color);
145 >                        free((void *)lp1->color);
146                  }
147                  lp2 = lp1->next;
148 <                free((char *)lp1);
148 >                free((void *)lp1);
149          }
150          lamps = NULL;
151   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)