--- ray/src/cv/trans.c 1990/12/11 08:45:51 1.1 +++ ray/src/cv/trans.c 2003/04/23 00:52:33 2.3 @@ -1,9 +1,6 @@ -/* Copyright (c) 1990 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: trans.c,v 2.3 2003/04/23 00:52:33 greg Exp $"; #endif - /* * Translator utilities * @@ -12,13 +9,15 @@ static char SCCSid[] = "$SunId$ LBL"; #include +#include + #include "trans.h" fgetid(idp, dls, fp) /* read an id up to char in dls from fp */ -register ID *idp; +ID *idp; char *dls; -FILE *fp; +register FILE *fp; { char dset[256/8]; char buf[MAXSTR]; @@ -89,7 +88,7 @@ int insert; if (idl->id == NULL) goto memerr; } else { /* grow old list */ - idl->id = (ID *)realloc((char *)idl->id,(idl->nids+1)*sizeof(ID)); + idl->id = (ID *)realloc((void *)idl->id,(idl->nids+1)*sizeof(ID)); if (idl->id == NULL) goto memerr; for (i = idl->nids; i > upper; i--) {