13 |
|
#include <signal.h> |
14 |
|
#include <string.h> |
15 |
|
|
16 |
– |
#include "standard.h" |
16 |
|
#include "platform.h" |
17 |
+ |
#include "standard.h" |
18 |
|
#include "color.h" |
19 |
|
#include "view.h" |
20 |
|
#include "paths.h" |
83 |
|
|
84 |
|
char *progname; |
85 |
|
|
86 |
+ |
static gethfunc headline; |
87 |
|
|
88 |
+ |
|
89 |
|
main(argc, argv) |
90 |
|
int argc; |
91 |
|
char **argv; |
92 |
|
{ |
91 |
– |
extern int headline(); |
93 |
|
FILE *fin; |
94 |
|
float *lampcolor; |
95 |
|
char *lamptype = NULL; |
329 |
|
double (*ourbright)() = rgb_bright; |
330 |
|
|
331 |
|
|
332 |
< |
int |
333 |
< |
headline(s) /* process line from header */ |
334 |
< |
char *s; |
332 |
> |
static int |
333 |
> |
headline( /* process line from header */ |
334 |
> |
char *s, |
335 |
> |
void *p |
336 |
> |
) |
337 |
|
{ |
338 |
|
char fmt[32]; |
339 |
|
|
493 |
|
if (obarsize > 0) { |
494 |
|
scoutbar = (COLOR **)malloc(obarsize*sizeof(COLOR *)); |
495 |
|
greybar = (float **)malloc(obarsize*sizeof(float *)); |
496 |
< |
if (scoutbar == NULL | greybar == NULL) |
496 |
> |
if ((scoutbar == NULL) | (greybar == NULL)) |
497 |
|
goto memerr; |
498 |
|
for (i = 0; i < obarsize; i++) { |
499 |
|
scoutbar[i] = (COLOR *)malloc(ncols*sizeof(COLOR)); |
500 |
|
greybar[i] = (float *)malloc(ncols*sizeof(float)); |
501 |
< |
if (scoutbar[i] == NULL | greybar[i] == NULL) |
501 |
> |
if ((scoutbar[i] == NULL) | (greybar[i] == NULL)) |
502 |
|
goto memerr; |
503 |
|
} |
504 |
|
} else { |