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

Comparing ray/src/meta/misc.c (file contents):
Revision 1.2 by schorsch, Thu Jul 3 22:41:44 2003 UTC vs.
Revision 1.4 by schorsch, Sat Nov 15 02:13:37 2003 UTC

# Line 6 | Line 6 | static const char      RCSid[] = "$Id$";
6   */
7  
8  
9 + #include  "rtio.h"
10   #include  "meta.h"
11  
12  
# Line 15 | Line 16 | char  errmsg[128];
16  
17  
18  
18 – error(errtype, emsg)            /* report error */
19 –
20 – int  errtype;
21 – char  *emsg;
22 –
23 – {
24 –
25 – switch (errtype)  {
26 –
27 –    case WARNING:
28 –       wputs(progname);
29 –       wputs(": warning - ");
30 –       wputs(emsg);
31 –       wputs("\n");
32 –       break;
33 –
34 –    case USER:
35 –       eputs(progname);
36 –       eputs(": fatal - ");
37 –       eputs(emsg);
38 –       eputs("\n");
39 –       exit(1);
40 –       break;
41 –
42 –    case SYSTEM:
43 –       eputs(progname);
44 –       eputs(": system - ");
45 –       eputs(emsg);
46 –       eputs("\n");
47 –       exit(1);
48 –       break;
49 –    }
50 –
51 – }
52 –
53 –
54 –
55 –
19   int
20 < comndx(c)               /* return index for command */
20 > comndx(         /* return index for command */
21 >        register int  c
22 > )
23  
59 – register int  c;
60 –
24   {
25   register char  *cp;
26  
# Line 77 | Line 40 | register int  c;
40  
41  
42   PRIMITIVE  *
43 < pop(pl)                 /* pop top off plist */
43 > pop(                    /* pop top off plist */
44 >        register PLIST  *pl
45 > )
46  
82 – register PLIST  *pl;
83 –
47   {
48   register PRIMITIVE  *p;
49  
# Line 95 | Line 58 | register PLIST  *pl;
58  
59  
60  
61 + void
62 + push(           /* push primitive onto plist */
63 +        register PRIMITIVE  *p,
64 +        register PLIST  *pl
65 + )
66  
99 – push(p, pl)             /* push primitive onto plist */
100 –
101 – register PRIMITIVE  *p;
102 – register PLIST  *pl;
103 –
67   {
68  
69   if ((p->pnext = pl->ptop) == NULL)
# Line 111 | Line 74 | register PLIST  *pl;
74  
75  
76  
77 <
78 < add(p, pl)              /* add primitive to plist */
79 <
80 < register PRIMITIVE  *p;
81 < register PLIST  *pl;
119 <
77 > void
78 > add(            /* add primitive to plist */
79 >        register PRIMITIVE  *p,
80 >        register PLIST  *pl
81 > )
82   {
83  
84   if (pl->ptop == NULL)
# Line 130 | Line 92 | register PLIST  *pl;
92  
93  
94  
95 + void
96 + append(         /* append pl1 to the end of pl2 */
97 +        register PLIST  *pl1,
98 +        register PLIST  *pl2
99 + )
100  
134 – append(pl1, pl2)                /* append pl1 to the end of pl2 */
135 –
136 – register PLIST  *pl1, *pl2;
137 –
101   {
102  
103      if (pl1->ptop != NULL) {
# Line 149 | Line 112 | register PLIST  *pl1, *pl2;
112  
113  
114  
115 + void
116 + fargs(          /* free any arguments p has */
117 + register PRIMITIVE  *p
118 + )
119  
153 – fargs(p)                /* free any arguments p has */
154 –
155 – register PRIMITIVE  *p;
156 –
120   {
121  
122   if (p->args != NULL) {
# Line 166 | Line 129 | register PRIMITIVE  *p;
129  
130  
131   char *
132 < nextscan(start, format, result)         /* scan and advance through string */
132 > nextscan(               /* scan and advance through string */
133 >        register char  *start,
134 >        char  *format,
135 >        char  *result
136 > )
137  
171 – register char  *start;
172 – char  *format;
173 – char  *result;
174 –
138   {
139  
140      if (start == NULL) return(NULL);
# Line 186 | Line 149 | char  *result;
149   }
150  
151  
152 <
153 < mcopy(p1, p2, n)        /* copy p2 into p1 size n */
154 <
155 < register char  *p1, *p2;
156 < register int  n;
152 > void
153 > mcopy(  /* copy p2 into p1 size n */
154 > register char  *p1,
155 > register char  *p2,
156 > register int  n
157 > )
158  
159   {
160  

Diff Legend

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