| 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(); |
| 15 |
< |
extern FILE *fropen(); |
| 14 |
> |
#include "standard.h" |
| 15 |
> |
#include "color.h" |
| 16 |
|
|
| 17 |
+ |
extern char *eindex(), *expsave(); |
| 18 |
+ |
extern FILE *frlibopen(); |
| 19 |
+ |
|
| 20 |
|
typedef struct lamp { |
| 21 |
|
char *pattern; /* search pattern */ |
| 22 |
|
float *color; /* pointer to lamp value */ |
| 51 |
|
char buf[128], str[128]; |
| 52 |
|
register char *cp1, *cp2; |
| 53 |
|
|
| 54 |
< |
if ((fp = fropen(file)) == NULL) |
| 54 |
> |
if ((fp = frlibopen(file)) == NULL) |
| 55 |
|
return(0); |
| 56 |
|
lastp = NULL; |
| 57 |
|
while (fgets(buf, sizeof(buf), fp) != NULL) { |
| 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 |
|
} |
