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

Comparing ray/src/common/otypes.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:54:51 1991 UTC vs.
Revision 2.4 by greg, Mon Mar 10 17:13:29 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1986 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Object type lookup and error reporting
6 + *
7 + *  External symbols declared in object.h
8   */
9  
10 + #include "copyright.h"
11 +
12   #include  "standard.h"
13  
14   #include  "object.h"
# Line 29 | Line 30 | register char  *ofname;
30   }
31  
32  
33 + void
34   objerror(o, etyp, msg)          /* report error related to object */
35   OBJREC  *o;
36   int  etyp;
# Line 37 | Line 39 | char  *msg;
39          char  msgbuf[128];
40  
41          sprintf(msgbuf, "%s for %s \"%s\"",
42 <                        msg, ofun[o->otype].funame, o->oname);
42 >                        msg, ofun[o->otype].funame,
43 >                        o->oname!=NULL ? o->oname : "(NULL)");
44          error(etyp, msgbuf);
45   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines