--- ray/src/hd/rhcopy.c 1998/01/07 17:46:18 3.7 +++ ray/src/hd/rhcopy.c 1998/10/27 08:49:50 3.9 @@ -35,10 +35,10 @@ char *argv[]; frompicz = -1; for (i = 2; i < argc && argv[i][0] == '-'; i++) switch (argv[i][1]) { - case 'c': + case 'u': checkrepeats = 1; break; - case 'f': + case 'd': checkdepth = 0; break; case 'h': @@ -63,9 +63,9 @@ char *argv[]; addholo(argv[i]); quit(0); userr: - fprintf(stderr, "Usage: %s output.hdk [-c][-f] -h inp1.hdk ..\n", + fprintf(stderr, "Usage: %s output.hdk [-u][-d] -h inp1.hdk ..\n", progname); - fprintf(stderr, " Or: %s output.hdk [-c][-f] -pz inp1.pic inp1.zbf ..\n", + fprintf(stderr, " Or: %s output.hdk [-u][-d] -pz inp1.pic inp1.zbf ..\n", progname); exit(1); } @@ -75,6 +75,7 @@ userr: #define H_OBST 02 #define H_OBSF 04 +int holheadline(s, hf) /* check holodeck header line */ register char *s; int *hf; @@ -86,7 +87,7 @@ int *hf; *hf |= H_BADF; else *hf &= ~H_BADF; - return; + return(0); } if (!strncmp(s, "OBSTRUCTIONS=", 13)) { s += 13; @@ -97,8 +98,9 @@ int *hf; *hf |= H_OBSF; else error(WARNING, "bad OBSTRUCTIONS value in holodeck"); - return; + return(0); } + return(0); } int @@ -247,6 +249,7 @@ struct phead { }; +int picheadline(s, ph) /* process picture header line */ char *s; struct phead *ph; @@ -255,20 +258,21 @@ struct phead *ph; if (formatval(fmt, s)) { ph->badfmt = strcmp(fmt, COLRFMT); - return; + return(0); } if (isprims(s)) { ph->altprims++; /* don't want to deal with this */ - return; + return(0); } if (isexpos(s)) { ph->expos *= exposval(s); - return; + return(0); } if (isview(s)) { ph->gotview += sscanview(&ph->vw, s); - return; + return(0); } + return(0); }