ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/devcomm.c
(Generate patch)

Comparing ray/src/rt/devcomm.c (file contents):
Revision 2.3 by greg, Mon Apr 5 15:16:47 1993 UTC vs.
Revision 2.5 by gregl, Tue Nov 11 19:55:03 1997 UTC

# Line 30 | Line 30 | struct driver  comm_driver = {
30          comm_comout, comm_comin, comm_flush
31   };
32  
33 + static int      mygets(), myputs(), reply_error(), getstate();
34 +
35   FILE    *devin, *devout;
36  
37   int     devchild;
# Line 45 | Line 47 | final_connect()                                /* verify and initialize connection
47                                                  /* get driver parameters */
48          getstate();
49                                                  /* set error vectors */
50 <        cmdvec = comm_comout;
51 <        if (wrnvec != NULL)
52 <                wrnvec = comm_comout;
50 >        erract[COMMAND].pf = comm_comout;
51 >        if (erract[WARNING].pf != NULL)
52 >                erract[WARNING].pf = comm_comout;
53          return(&comm_driver);
54   }
55  
# Line 72 | Line 74 | char   *dname, *id;
74          char    pin[16], pout[16];
75                                                  /* find driver program */
76          if ((devname = getpath(dname, DEVPATH, X_OK)) == NULL) {
77 <                stderr_v(dname);
78 <                stderr_v(": not found\n");
77 >                eputs(dname);
78 >                eputs(": not found\n");
79                  return(NULL);
80          }
81                                                  /* open communication pipes */
# Line 108 | Line 110 | comm_close()                   /* done with driver */
110   {
111          int     pid;
112  
113 <        cmdvec = NULL;                          /* reset error vectors */
114 <        if (wrnvec != NULL)
115 <                wrnvec = stderr_v;
113 >        erract[COMMAND].pf = NULL;              /* reset error vectors */
114 >        if (erract[WARNING].pf != NULL)
115 >                erract[WARNING].pf = wputs;
116          fclose(devout);
117          fclose(devin);
118          if (devchild < 0)
# Line 233 | Line 235 | static
235   reply_error(routine)                    /* what should we do here? */
236   char    *routine;
237   {
238 <        stderr_v(routine);
239 <        stderr_v(": driver reply error\n");
238 >        eputs(routine);
239 >        eputs(": driver reply error\n");
240          quit(1);
241   }
242  

Diff Legend

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