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

Comparing ray/src/hd/rholo4.c (file contents):
Revision 3.33 by greg, Tue Jul 1 21:21:40 2003 UTC vs.
Revision 3.35 by schorsch, Sun Jul 27 22:12:02 2003 UTC

# Line 124 | Line 124 | int    block;
124                          dpout = NULL;
125                          error(USER, "display process died");
126                  }
127 <                if (errno != EAGAIN & errno != EINTR)
127 >                if ((errno != EAGAIN) & (errno != EINTR))
128                          goto readerr;
129                  return(2);              /* acceptable failure */
130          }
# Line 186 | Line 186 | int    block;
186          case DR_VIEWPOINT:      /* set target eye position */
187                  if (msg.nbytes != sizeof(VIEWPOINT))
188                          error(INTERNAL, "bad DR_VIEWPOINT from display process");
189 <                copystruct(&myeye, (VIEWPOINT *)buf);
189 >                myeye = *((VIEWPOINT *)buf);
190                  break;
191          case DR_ATTEN:          /* block for priority request */
192                  if (msg.nbytes)
# Line 215 | Line 215 | int    block;
215          case DR_CLOBBER:        /* clobber holodeck */
216                  if (msg.nbytes)
217                          error(INTERNAL, "bad DR_CLOBBER from display process");
218 <                if (force <= 0 | ncprocs <= 0)
218 >                if ((force <= 0) | (ncprocs <= 0))
219                          error(WARNING, "request to clobber holodeck denied");
220                  else {
221                          error(WARNING, "clobbering holodeck contents");

Diff Legend

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