ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/rview.c

Comparing ray/src/rt/rview.c (file contents):
Revision 1.6 by greg, Sat Jul 29 00:11:31 1989 UTC vs.
Revision 1.7 by greg, Wed Oct 25 15:37:19 1989 UTC

#	Line 69 | Line 69 | devopen(dname)                         /* open device driver */
69		char  *dname;
70		{
71		extern char  *progname, *octname;
72	<	char  *devargv[3];
72	>	char  *id;
73		register int  i;
74
75	<	devargv[0] = dname;
76	<	devargv[1] = octname!=NULL ? octname : progname;
77	<	devargv[2] = NULL;
75	>	id = octname!=NULL ? octname : progname;
76		/* check device table */
77		for (i = 0; devtable[i].name; i++)
78		if (!strcmp(dname, devtable[i].name))
79	<	if ((dev = (*devtable[i].init)(devargv[1])) == NULL) {
79	>	if ((dev = (*devtable[i].init)(dname, id)) == NULL) {
80		sprintf(errmsg, "cannot initialize %s", dname);
81		error(USER, errmsg);
82		} else
83		return;
84		/* not there, try exec */
85	<	if ((dev = comm_init(devargv)) == NULL) {
85	>	if ((dev = comm_init(dname, id)) == NULL) {
86		sprintf(errmsg, "cannot start device \"%s\"", dname);
87		error(USER, errmsg);
88		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)