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

Comparing ray/src/rt/devmain.c (file contents):
Revision 2.4 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.6 by greg, Thu Feb 9 21:54:11 2023 UTC

# Line 91 | Line 91 | r_paintr()                             /* paint a rectangle */
91          COLOR   col;
92          int     xmin, ymin, xmax, ymax;
93  
94 <        fread((char *)col, sizeof(COLOR), 1, devin);
94 >        getbinary((char *)col, sizeof(COLOR), 1, devin);
95          xmin = getw(devin); ymin = getw(devin);
96          xmax = getw(devin); ymax = getw(devin);
97          (*dev->paintr)(col, xmin, ymin, xmax, ymax);
# Line 127 | Line 127 | r_getcur()                             /* get and return cursor position */
127   }
128  
129  
130 + void
131 + mygets(char *s, FILE *fp)                       /* get string from file (with nul) */
132 + {
133 +        int     c;
134 +
135 +        while ((c = getc(fp)) != EOF)
136 +                if ((*s++ = c) == '\0')
137 +                        return;
138 +        *s = '\0';
139 + }
140 +
141 +
142 + void
143 + myputs(const char *s, FILE *fp)                 /* put string to file (with nul) */
144 + {
145 +        do
146 +                putc(*s, fp);
147 +        while (*s++);
148 + }
149 +
150 +
151   r_comout()                              /* print string to command line */
152   {
153          char    str[256];
# Line 155 | Line 176 | r_comin()                              /* read string from command line */
176   }
177  
178  
158 – mygets(s, fp)                           /* get string from file (with nul) */
159 – register char   *s;
160 – register FILE   *fp;
161 – {
162 –        register int    c;
163 –
164 –        while ((c = getc(fp)) != EOF)
165 –                if ((*s++ = c) == '\0')
166 –                        return;
167 –        *s = '\0';
168 – }
169 –
170 –
171 – myputs(s, fp)                           /* put string to file (with nul) */
172 – register char   *s;
173 – register FILE   *fp;
174 – {
175 –        do
176 –                putc(*s, fp);
177 –        while (*s++);
178 – }
179 –
180 –
179   void
180 < eputs(s)                                /* put string to stderr */
183 < register char  *s;
180 > eputs(const char *s)                            /* put string to stderr */
181   {
182          static int  midline = 0;
183  
# Line 200 | Line 197 | register char  *s;
197  
198   sendstate()                             /* send driver state variables */
199   {
200 <        fwrite((char *)&dev->pixaspect, sizeof(dev->pixaspect), 1, devout);
200 >        putbinary(&dev->pixaspect, sizeof(dev->pixaspect), 1, devout);
201          putw(dev->xsiz, devout);
202          putw(dev->ysiz, devout);
203          putw(dev->inpready, devout);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines