| 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 <stdio.h> |
| 8 |
> |
#include "copyright.h" |
| 9 |
> |
|
| 10 |
|
#include <ctype.h> |
| 11 |
+ |
|
| 12 |
+ |
#include "standard.h" |
| 13 |
+ |
#include "paths.h" |
| 14 |
|
#include "color.h" |
| 15 |
|
|
| 16 |
< |
extern char *eindex(), *expsave(), *malloc(); |
| 16 |
< |
extern FILE *frlibopen(); |
| 16 |
> |
extern char *eindex(), *expsave(); |
| 17 |
|
|
| 18 |
|
typedef struct lamp { |
| 19 |
|
char *pattern; /* search pattern */ |
| 25 |
|
|
| 26 |
|
|
| 27 |
|
float * |
| 28 |
< |
matchlamp(s) /* see if string matches any lamp */ |
| 29 |
< |
char *s; |
| 28 |
> |
matchlamp( /* see if string matches any lamp */ |
| 29 |
> |
char *s |
| 30 |
> |
) |
| 31 |
|
{ |
| 32 |
|
register LAMP *lp; |
| 33 |
|
|
| 40 |
|
} |
| 41 |
|
|
| 42 |
|
|
| 43 |
< |
loadlamps(file) /* load lamp type file */ |
| 44 |
< |
char *file; |
| 43 |
> |
int |
| 44 |
> |
loadlamps( /* load lamp type file */ |
| 45 |
> |
char *file |
| 46 |
> |
) |
| 47 |
|
{ |
| 48 |
|
LAMP *lastp; |
| 49 |
|
register LAMP *lp; |
| 129 |
|
} |
| 130 |
|
|
| 131 |
|
|
| 132 |
< |
freelamps() /* free our lamps list */ |
| 132 |
> |
void |
| 133 |
> |
freelamps(void) /* free our lamps list */ |
| 134 |
|
{ |
| 135 |
|
register LAMP *lp1, *lp2; |
| 136 |
|
|
| 140 |
|
for (lp2 = lp1->next; lp2 != NULL; lp2 = lp2->next) |
| 141 |
|
if (lp2->color == lp1->color) |
| 142 |
|
lp2->color = NULL; |
| 143 |
< |
free((char *)lp1->color); |
| 143 |
> |
free((void *)lp1->color); |
| 144 |
|
} |
| 145 |
|
lp2 = lp1->next; |
| 146 |
< |
free((char *)lp1); |
| 146 |
> |
free((void *)lp1); |
| 147 |
|
} |
| 148 |
|
lamps = NULL; |
| 149 |
|
} |
