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

Comparing ray/src/common/lamps.c (file contents):
Revision 2.5 by greg, Mon Oct 16 09:21:46 1995 UTC vs.
Revision 2.8 by schorsch, Sat Jun 7 12:50:20 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 + #include  "standard.h"
15   #include  "color.h"
16  
17 < extern char     *eindex(), *expsave(), *malloc();
17 > extern char     *eindex(), *expsave();
18   extern FILE     *frlibopen();
19  
20   typedef struct lamp {
# Line 136 | Line 138 | freelamps()                    /* free our lamps list */
138                          for (lp2 = lp1->next; lp2 != NULL; lp2 = lp2->next)
139                                  if (lp2->color == lp1->color)
140                                          lp2->color = NULL;
141 <                        free((char *)lp1->color);
141 >                        free((void *)lp1->color);
142                  }
143                  lp2 = lp1->next;
144 <                free((char *)lp1);
144 >                free((void *)lp1);
145          }
146          lamps = NULL;
147   }

Diff Legend

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